Do not use chgrp when have DESTDIR (i.e. making rpm)

[bacula/bacula] / bacula / src / filed / Makefile.in

diff --git a/bacula/src/filed/Makefile.in b/bacula/src/filed/Makefile.in
index 69a7f71721406c328e38ac07640c8321aefaf96e..5a6e67d1f9bd835bbfda0b78e1d18699313dd08a 100644 (file)
--- a/bacula/src/filed/Makefile.in
+++ b/bacula/src/filed/Makefile.in
@@ -1,9 +1,8 @@
 #
 # Bacula Makefile for the File daemon
 #
-#
-# Author: Kern Sibbald
-# License: LGPLv3
+# Copyright (C) 2000-2016 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
 #
 @MCOMMON@
 
@@ -31,10 +30,12 @@ first_rule: all
 dummy:
 
 #
-SVRSRCS = filed.c authenticate.c acl.c backup.c estimate.c \
+SVRSRCS = filed.c authenticate.c backup.c crypto.c \
+         estimate.c \
          fd_plugins.c accurate.c \
-         filed_conf.c heartbeat.c job.c \
-         restore.c status.c verify.c verify_vol.c xattr.c
+         filed_conf.c heartbeat.c hello.c job.c fd_snapshot.c \
+         restore.c status.c verify.c verify_vol.c \
+         xacl.c xacl_linux.c xacl_osx.c xacl_solaris.c xacl_freebsd.c
 SVROBJS = $(SVRSRCS:.c=.o)
 
 # these are the objects that are changed by the .configure process
@@ -59,44 +60,19 @@ all: Makefile bacula-fd @STATIC_FD@
        @echo "==== Make of filed is good ===="
        @echo " "
 
-acl.o: acl.c
+xacl.o: xacl.c
        @echo "Compiling $<"
        $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(LZO_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $(AFS_CFLAGS) $<
 
-win32/winlib.a:
-       @if test -f win32/Makefile -a "${GMAKE}" != "none"; then \
-          (cd win32; $(GMAKE) DESTDIR=$(DESTDIR)); \
-       fi
-       @rm -f bacula-fd.exe
-
-win32/winmain.o:
-       @if test -f win32/Makefile -a "${GMAKE}" != "none"; then \
-          (cd win32; $(GMAKE) DESTDIR=$(DESTDIR)); \
-       fi
-       @rm -f bacula-fd.exe
-
-win32/winres.res:
-       @if test -f win32/Makefile -a "${GMAKE}" != "none"; then \
-          (cd win32; $(GMAKE) DESTDIR=$(DESTDIR)); \
-       fi
-       @rm -f bacula-fd.exe
-
-# win32 libraries if needed
-win32: $(WIN32OBJS)
-       @if test -f win32/Makefile -a "${GMAKE}" != "none"; then \
-          (cd win32; $(GMAKE) DESTDIR=$(DESTDIR)); \
-       fi
-       @rm -f bacula-fd.exe
-
 bacula-fd:  Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
        @echo "Linking $@ ..."
        $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
-         $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
+         $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
          $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
 
 static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
        $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
-          $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
+          $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
           $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
        strip $@
 
@@ -110,9 +86,6 @@ libtool-clean:
 clean: libtool-clean
        @$(RMF) bacula-fd filed core core.* a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
        @$(RMF) static-bacula-fd
-       @if test -f win32/Makefile -a "${GMAKE}" != "none"; then \
-          (cd win32; $(GMAKE) clean); \
-       fi
 
 realclean: clean
        @$(RMF) tags bacula-fd.conf
@@ -120,19 +93,13 @@ realclean: clean
 distclean: realclean
        if test $(srcdir) = .; then $(MAKE) realclean; fi
        (cd $(srcdir); $(RMF) Makefile)
-       @if test -f win32/Makefile -a "${GMAKE}" != "none"; then \
-          (cd win32; $(GMAKE) distclean); \
-       fi
 
 devclean: realclean
        if test $(srcdir) = .; then $(MAKE) realclean; fi
        (cd $(srcdir); $(RMF) Makefile)
-       @if test -f win32/Makefile -a "${GMAKE}" != "none"; then \
-          (cd win32; $(GMAKE) devclean); \
-       fi
 
 install: all
-       $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-fd $(DESTDIR)$(sbindir)/bacula-fd 
+       $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-fd $(DESTDIR)$(sbindir)/bacula-fd
        @srcconf=bacula-fd.conf; \
        if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
           destconf=$$srcconf.new; \
@@ -142,7 +109,7 @@ install: all
        fi; \
        echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
        ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
-       @if test "x${fd_group}" != "x"; then \
+       @if test "x${fd_group}" != "x" -a "x${DESTDIR}" = "x" ; then \
           chgrp -f ${fd_group} ${DESTDIR}${sysconfdir}/$$destconf ; \
        fi
        @if test -f static-bacula-fd; then \
@@ -150,7 +117,6 @@ install: all
        fi
 
 uninstall:
-       (cd $(DESTDIR)$(sbindir); $(RMF) bacula-fd)
        (cd $(DESTDIR)$(sysconfdir); $(RMF) bacula-fd.conf)
        (cd $(DESTDIR)$(sysconfdir); $(RMF) bacula-fd.conf.new)