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

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

diff --git a/bacula/src/stored/Makefile.in b/bacula/src/stored/Makefile.in
index bb5a9bbd466e2ed5b0cd6910f3c4766252190b69..2805480d338d72db11c57bf1c4312897728ebe66 100644 (file)
--- a/bacula/src/stored/Makefile.in
+++ b/bacula/src/stored/Makefile.in
@@ -1,4 +1,7 @@
 #
+# Copyright (C) 2000-2015 by Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
 @MCOMMON@
 
 srcdir =       .
@@ -24,50 +27,66 @@ first_rule: all
 dummy:
 
 # bacula-sd
-SDOBJS =  stored.o ansi_label.o vtape.o \
+SDOBJS =  stored.o ansi_label.o vtape_dev.o \
          autochanger.o acquire.o append.o \
          askdir.o authenticate.o \
-         block.o butil.o dev.o \
-         device.o dircmd.o dvd.o ebcdic.o fd_cmds.o job.o \
-         label.o lock.o mac.o match_bsr.o mount.o parse_bsr.o \
-         pythonsd.o read.o read_record.o record.o \
+         block.o block_util.o butil.o dev.o os.o file_dev.o tape_dev.o \
+         device.o dircmd.o ebcdic.o fd_cmds.o job.o \
+         hello.o \
+         label.o lock.o match_bsr.o mount.o parse_bsr.o \
+         read.o read_records.o \
+         record_read.o record_write.o record_util.o \
          reserve.o scan.o sd_plugins.o \
-         spool.o status.o stored_conf.o vol_mgr.o wait.o
+         spool.o status.o stored_conf.o \
+         vbackup.o vol_mgr.o wait.o
 
 # btape
-TAPEOBJS = btape.o block.o butil.o dev.o device.o label.o vtape.o \
-          lock.o ansi_label.o dvd.o ebcdic.o \
-          autochanger.o acquire.o mount.o record.o read_record.o \
+TAPEOBJS = btape.o block.o block_util.o butil.o \
+          dev.o os.o file_dev.o tape_dev.o \
+          device.o label.o vtape_dev.o \
+          lock.o ansi_label.o ebcdic.o \
+          autochanger.o acquire.o mount.o record_util.o \
+          read_records.o record_read.o record_write.o \
           reserve.o stored_conf.o match_bsr.o parse_bsr.o scan.o \
-          spool.o vol_mgr.o wait.o
+          sd_plugins.o status.o spool.o vol_mgr.o wait.o
 
 # bls
-BLSOBJS = bls.o block.o butil.o device.o dev.o label.o match_bsr.o vtape.o \
-         ansi_label.o dvd.o ebcdic.o lock.o \
-         autochanger.o acquire.o mount.o parse_bsr.o record.o  \
-         read_record.o reserve.o scan.o stored_conf.o spool.o \
-         vol_mgr.o wait.o
+BLSOBJS = bls.o block.o block_util.o butil.o device.o \
+         dev.o os.o file_dev.o tape_dev.o label.o match_bsr.o vtape_dev.o \
+         ansi_label.o ebcdic.o lock.o \
+         autochanger.o acquire.o mount.o parse_bsr.o \
+         record_read.o record_write.o record_util.o \
+         read_records.o reserve.o scan.o stored_conf.o spool.o \
+         sd_plugins.o status.o vol_mgr.o wait.o
 
 # bextract
-BEXTOBJS = bextract.o block.o device.o dev.o label.o record.o vtape.o \
-          ansi_label.o dvd.o ebcdic.o lock.o \
+BEXTOBJS = bextract.o block.o block_util.o device.o \
+          dev.o os.o file_dev.o tape_dev.o label.o vtape_dev.o \
+          ansi_label.o ebcdic.o lock.o \
           autochanger.o acquire.o mount.o match_bsr.o parse_bsr.o butil.o \
-          read_record.o reserve.o scan.o stored_conf.o spool.o \
-          vol_mgr.o wait.o
+          read_records.o record_read.o record_write.o record_util.o \
+          reserve.o scan.o stored_conf.o spool.o \
+          sd_plugins.o status.o vol_mgr.o wait.o
 
 # bscan
-SCNOBJS = bscan.o block.o device.o dev.o label.o vtape.o \
-         ansi_label.o dvd.o ebcdic.o lock.o \
-         autochanger.o acquire.o mount.o record.o match_bsr.o parse_bsr.o \
-         butil.o read_record.o scan.o reserve.o stored_conf.o spool.o \
-         vol_mgr.o wait.o
+SCNOBJS = bscan.o block.o block_util.o device.o \
+         dev.o os.o file_dev.o tape_dev.o label.o vtape_dev.o \
+         ansi_label.o ebcdic.o lock.o \
+         autochanger.o acquire.o mount.o \
+         record_read.o record_write.o read_records.o record_util.o \
+         match_bsr.o parse_bsr.o \
+         butil.o scan.o reserve.o stored_conf.o spool.o \
+         sd_plugins.o status.o vol_mgr.o wait.o
 
 # bcopy
-COPYOBJS = bcopy.o block.o device.o dev.o label.o vtape.o \
-          ansi_label.o dvd.o ebcdic.o lock.o \
-          autochanger.o acquire.o mount.o record.o match_bsr.o parse_bsr.o \
-          butil.o read_record.o reserve.o \
-          scan.o stored_conf.o spool.o vol_mgr.o wait.o
+COPYOBJS = bcopy.o block.o block_util.o device.o \
+          dev.o os.o file_dev.o tape_dev.o label.o vtape_dev.o \
+          ansi_label.o ebcdic.o lock.o \
+          autochanger.o acquire.o mount.o \
+          record_read.o record_write.o read_records.o record_util.o \
+          match_bsr.o parse_bsr.o butil.o reserve.o \
+          sd_plugins.o scan.o status.o stored_conf.o spool.o \
+          vol_mgr.o wait.o
 
 
 
@@ -76,7 +95,8 @@ EXTRAOBJS = @OBJLIST@
 
 CAP_LIBS = @CAP_LIBS@
 ZLIBS=@ZLIBS@
-LZOLIBS = @LZOLIBS@
+LZO_LIBS= @LZO_LIBS@
+LZO_INC= @LZO_INC@
 
 
 .SUFFIXES:     .c .o
@@ -86,22 +106,22 @@ LZOLIBS = @LZOLIBS@
 # inference rules
 .c.o:
        @echo "Compiling $<"
-       $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+       $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 #-------------------------------------------------------------------------
 
 all: Makefile bacula-sd @STATIC_SD@ bls bextract bscan btape bcopy
        @echo "===== Make of stored is good ===="
        @echo " "
 
-bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+bacula-sd: Makefile $(SDOBJS) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
        @echo "Linking $@ ..."
        $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(SDOBJS) $(ZLIBS) \
-          -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
+          -lbaccfg -lbac -lm $(DLIB) $(LIBS) $(WRAPLIBS) \
        $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
 
-static-bacula-sd: Makefile $(SDOBJS) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+static-bacula-sd: Makefile $(SDOBJS) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
        $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -o $@ $(SDOBJS) $(ZLIBS) \
-          -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(WRAPLIBS) \
+          -lbaccfg -lbac -lm $(DLIB) $(LIBS) $(WRAPLIBS) \
        $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
        strip $@
 
@@ -127,11 +147,11 @@ bls:      Makefile $(BLSOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/lib
 bextract.o: bextract.c
        @echo "Compiling $<"
        $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) \
-          -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
+          -I$(basedir) $(DINCLUDE) $(CFLAGS) $(LZO_INC) $<
 
 bextract: Makefile $(BEXTOBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
        @echo "Compiling $<"
-       $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZOLIBS) \
+       $(LIBTOOL_LINK) $(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(ZLIBS) $(LZO_LIBS) \
           -lbacfind -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 bscan.o: bscan.c
@@ -173,7 +193,7 @@ install: all
        fi; \
        echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
        ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
-       @if test "x${sd_group}" != "x"; then \
+       @if test "x${sd_group}" != "x" -a "x${DESTDIR}" = "x" ; then \
           chgrp -f ${sd_group} ${DESTDIR}${sysconfdir}/$$destconf; \
        fi
        @if test -f static-bacula-sd; then \
@@ -216,7 +236,7 @@ depend:
        @$(MV) Makefile Makefile.bak
        @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
        @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
-       @$(CXX) -S -M $(CPPFLAGS) $(XINC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile
+       @$(CXX) -S -M $(CPPFLAGS) $(XINC) -I$(srcdir) -I$(basedir) *.c >> Makefile
        @if test -f Makefile ; then \
            $(RMF) Makefile.bak; \
        else \