Просмотр исходного кода

Add support for per OS CP flags

This is used on platforms, where CP doesn't have -a parameter.

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Fabio M. Di Nitto <fdinitto@redhat.com>
Jan Friesse 14 лет назад
Родитель
Сommit
8705810ff3
3 измененных файлов с 5 добавлено и 2 удалено
  1. 3 0
      configure.ac
  2. 1 1
      exec/Makefile.am
  3. 1 1
      lib/Makefile.am

+ 3 - 0
configure.ac

@@ -272,6 +272,7 @@ AC_ARG_ENABLE([snmp],
 # OS detection
 # THIS SECTION MUST DIE!
 CP=cp
+CP_ARGS="-a"
 OS_LDL="-ldl"
 case "$host_os" in
 	*linux*)
@@ -322,6 +323,7 @@ case "$host_os" in
 			*netbsd*)
 				AC_DEFINE_UNQUOTED([_SEM_SEMUN_UNDEFINED], [1],
 					   [The semun structure is undefined])
+				CP_ARGS="-RpP"
 			;;
 		esac
 	;;
@@ -346,6 +348,7 @@ case "$host_os" in
 esac
 
 AC_SUBST(CP)
+AC_SUBST(CP_ARGS)
 # *FLAGS handling goes here
 
 ENV_CFLAGS="$CFLAGS"

+ 1 - 1
exec/Makefile.am

@@ -158,7 +158,7 @@ all-local: $(LCRSO_OBJS) $(LCRSO) $(SHARED_LIBS)
 install-exec-local:
 	$(INSTALL) -d $(DESTDIR)/$(libdir)
 	$(INSTALL) -m 755 $(SHARED_LIBS) $(DESTDIR)/$(libdir)
-	$(CP) -a $(SHARED_LIBS_SO) $(SHARED_LIBS_SO_TWO) $(DESTDIR)/$(libdir)
+	$(CP) $(CP_ARGS) $(SHARED_LIBS_SO) $(SHARED_LIBS_SO_TWO) $(DESTDIR)/$(libdir)
 	$(INSTALL) -d $(DESTDIR)/$(LCRSODIR)
 	$(INSTALL) -m 755 $(LCRSO) $(DESTDIR)/$(LCRSODIR)
 

+ 1 - 1
lib/Makefile.am

@@ -129,7 +129,7 @@ all-local: $(get_explicit_sharedlibs) $(SHARED_LIBS_SO)
 install-exec-local:
 	$(INSTALL) -d $(DESTDIR)/$(libdir)
 	$(INSTALL) -m 755 $(get_sharedlibs) $(get_explicit_sharedlibs) $(DESTDIR)/$(libdir)
-	$(CP) -a $(SHARED_LIBS_SO) $(EXPLICIT_SHARED_LIBS_SO) $(get_sharedlibs_two) $(get_explicit_sharedlibs_two) $(DESTDIR)/$(libdir)
+	$(CP) $(CP_ARGS) $(SHARED_LIBS_SO) $(EXPLICIT_SHARED_LIBS_SO) $(get_sharedlibs_two) $(get_explicit_sharedlibs_two) $(DESTDIR)/$(libdir)
 
 uninstall-local:
 	cd $(DESTDIR)/$(libdir)/ && \