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

diff --git a/bacula/src/dird/Makefile.in b/bacula/src/dird/Makefile.in
index 2ee1d931679a994649af3f0fec5d0381f0c786eb..fd727ecd0cfac8bdf2149efb0d776d2373eee380 100644 (file)
--- a/bacula/src/dird/Makefile.in
+++ b/bacula/src/dird/Makefile.in
@@ -103,7 +103,7 @@ devclean: realclean
 install: all
        $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bacula-dir $(DESTDIR)$(sbindir)/bacula-dir
        @srcconf=bacula-dir.conf; \
-          if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
+          if test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
              destconf=$$srcconf.new; \
              echo "  ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
           else \
@@ -111,10 +111,10 @@ install: all
           fi; \
           echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
           ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
-          @if test "x${dir_group}" != "x"; then \
+          @if test "x${dir_group}" != "x" -a "x${DESTDIR}" = "x" ; then \
              chgrp -f ${dir_group} ${DESTDIR}${sysconfdir}/$$destconf ; \
           fi
-       @if  test -f ${DESTDIR}${scriptdir}/query.sql; then \
+       @if test -f ${DESTDIR}${scriptdir}/query.sql; then \
           echo "  ==> Saving existing query.sql to query.sql.old"; \
           $(MV) -f ${DESTDIR}${scriptdir}/query.sql ${DESTDIR}${scriptdir}/query.sql.old; \
        fi

diff --git a/bacula/src/filed/Makefile.in b/bacula/src/filed/Makefile.in
index fdbffb438556e4734c03d7f238af2a8cf4685d0d..5a6e67d1f9bd835bbfda0b78e1d18699313dd08a 100644 (file)
--- a/bacula/src/filed/Makefile.in
+++ b/bacula/src/filed/Makefile.in
@@ -109,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 \

diff --git a/bacula/src/stored/Makefile.in b/bacula/src/stored/Makefile.in
index 9a84b4c22d7ad00441de8d4e5a4fd15f549ce23e..2805480d338d72db11c57bf1c4312897728ebe66 100644 (file)
--- a/bacula/src/stored/Makefile.in
+++ b/bacula/src/stored/Makefile.in
@@ -193,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 \