Tweak Makefile.in

[bacula/bacula] / bacula / Makefile.in

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index a308e147ac237155943bd6a00040ca7869d08249..4f0543b026cca693e9b39e2866e475f8721bded6 100755 (executable)
--- a/bacula/Makefile.in
+++ b/bacula/Makefile.in
@@ -1,6 +1,9 @@
 # 
 # Master Makefile
 #
+# Author: Kern Sibbald
+# License: LGPLv3
+#
 @MCOMMON@
 
 working_dir=@working_dir@
@@ -19,8 +22,7 @@ dummy:
 
 # --client-only directories
 fd_subdirs = src scripts src/lib src/findlib src/filed \
-       @READLINE_SRC@ @BAT_DIR@ @TRAY_MONITOR_DIR@ @WX_DIR@ \
-       src/console @FD_PLUGIN_DIR@
+       @READLINE_SRC@ @BAT_DIR@ src/console @FD_PLUGIN_DIR@
 
 # Non-client-only directores
 subdirs =    src/cats @DIRD_DIR@ @STORED_DIR@ src/tools
@@ -45,7 +47,7 @@ all: Makefile
        @for I in ${all_subdirs}; \
          do (cd $$I; echo "==>Entering directory `pwd`"; \
              $(MAKE) DESTDIR=$(DESTDIR) $@ || (echo ""; echo ""; echo "  ====== Error in `pwd` ======"; \
-                           echo ""; echo ""; exit 1;)); \
+                           echo ""; echo ""; false ) || false) || exit 1; \
        done
 
 depend:
@@ -55,8 +57,9 @@ depend:
 bacula-fd: Makefile       
        @for I in ${fd_subdirs}; \
          do (cd $$I; echo "==>Entering directory `pwd`"; \
-             $(MAKE) DESTDIR=$(DESTDIR) all || (echo ""; echo ""; echo "   ====== Error in `pwd` ======"; \
-                           echo ""; echo ""; exit 1;)); \
+             $(MAKE) DESTDIR=$(DESTDIR) all || \
+             (echo ""; echo ""; echo "   ====== Error in `pwd` ======"; \
+              echo ""; echo ""; false ) || false) || exit 1; \
        done
 
 #-------------------------------------------------------------------------
@@ -94,7 +97,7 @@ libtool: Makefile $(LIBTOOL_DEPS)
 installdirs:
        $(MKDIR) $(DESTDIR)$(sbindir)
        $(MKDIR) $(DESTDIR)$(sysconfdir)
-       chmod 760 $(DESTDIR)$(sysconfdir)
+       chmod 770 $(DESTDIR)$(sysconfdir)
        -if test "x$(dir_user)" != "x" ; then \
           chown $(dir_user) $(DESTDIR)$(sysconfdir); \
        fi
@@ -115,31 +118,6 @@ installdirs:
           chgrp $(dir_group) $(DESTDIR)$(working_dir); \
        fi
 
-gnomedirs:
-       $(MKDIR) $(DESTDIR)/usr/share/pixmaps
-       $(MKDIR) $(DESTDIR)/usr/share/gnome/apps/System
-       $(MKDIR) $(DESTDIR)/usr/share/applications
-       $(MKDIR) $(DESTDIR)/etc/security/console.apps
-       $(MKDIR) $(DESTDIR)/etc/pam.d
-
-install-menu: gnomedirs
-       ${INSTALL_DATA} scripts/bacula.png $(DESTDIR)/usr/share/pixmaps/bacula.png
-       ${INSTALL_DATA} scripts/bacula.desktop.gnome1 $(DESTDIR)/usr/share/gnome/apps/System/bacula.desktop
-       ${INSTALL_DATA} scripts/bacula.desktop.gnome2 $(DESTDIR)/usr/share/applications/bacula.desktop
-
-install-menu-xsu: gnomedirs
-       ${INSTALL_DATA} scripts/bacula.png $(DESTDIR)/usr/share/pixmaps/bacula.png
-       ${INSTALL_DATA} scripts/bacula.desktop.gnome1.xsu $(DESTDIR)/usr/share/gnome/apps/System/bacula.desktop
-       ${INSTALL_DATA} scripts/bacula.desktop.gnome2.xsu $(DESTDIR)/usr/share/applications/bacula.desktop
-
-install-menu-consolehelper: gnomedirs
-       ${INSTALL_DATA} scripts/bacula.png $(DESTDIR)/usr/share/pixmaps/bacula.png
-       ${INSTALL_DATA} scripts/bacula.desktop.gnome1.consolehelper $(DESTDIR)/usr/share/gnome/apps/System/bacula.desktop
-       ${INSTALL_DATA} scripts/bacula.desktop.gnome2.consolehelper $(DESTDIR)/usr/share/applications/bacula.desktop
-       ${INSTALL_DATA} scripts/gnome-console.console_apps $(DESTDIR)/etc/security/console.apps/gnome-console
-       ${INSTALL_DATA} scripts/gnome-console.pamd $(DESTDIR)/etc/pam.d/gnome-console
-       ln -s $(DESTDIR)/usr/bin/consolehelper $(DESTDIR)/usr/bin/gnome-console
-
 install: installdirs
        @for I in $(doc_files) ; do $(INSTALL_DATA) $$I $(DESTDIR)${docdir}; done
        @for I in $(all_subdirs); do (cd $$I && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1); done
@@ -171,19 +149,6 @@ uninstall-autostart-fd:
 uninstall-autostart-sd:
        (cd platforms && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1)
 
-uninstall-menu:
-       $(RMF) $(DESTDIR)/usr/share/pixmaps/bacula.png
-       $(RMF) $(DESTDIR)/usr/share/gnome/apps/System/bacula.desktop
-       $(RMF) $(DESTDIR)/usr/share/applications/bacula.desktop
-
-uninstall-menu-consolehelper:
-       $(RMF) $(DESTDIR)/usr/share/pixmaps/bacula.png
-       $(RMF) $(DESTDIR)/usr/share/gnome/apps/System/bacula.desktop
-       $(RMF) $(DESTDIR)/usr/share/applications/bacula.desktop
-       $(RMF) $(DESTDIR)/etc/security/console.apps/gnome-console
-       $(RMF) $(DESTDIR)/etc/pam.d/gnome-console
-       $(RMF) $(DESTDIR)/usr/bin/gnome-console
-
 Makefile: Makefile.in
        cd $(topdir) \
            && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -191,21 +156,18 @@ Makefile: Makefile.in
 Makefiles:
        $(SHELL) config.status
        (cd scripts; \
-        chmod 755 startmysql stopmysql bacula startit stopit btraceback; \
-        chmod 755 mtx-changer bconsole gconsole devel_bacula; \
-        chmod 755 dvd-handler)
-
+        chmod 755 startmysql stopmysql bacula startit stopit btraceback \
+           mtx-changer bconsole gconsole devel_bacula dvd-handler)
        (cd src/cats; \
-        chmod 755 create_bacula_database update_bacula_tables make_bacula_tables; \
-        chmod 755 grant_bacula_privileges drop_bacula_tables drop_bacula_database; \
-        chmod 755 make_catalog_backup delete_catalog_backup)
-
+        chmod 755 create_bacula_database update_bacula_tables \
+          make_bacula_tables grant_bacula_privileges drop_bacula_tables \
+          drop_bacula_database make_catalog_backup delete_catalog_backup)
        @for I in @DB_BACKENDS@ ; do \
          (cd src/cats; \
-          chmod 755 create_$${I}_database update_$${I}_tables make_$${I}_tables; \
-          chmod 755 grant_$${I}_privileges drop_$${I}_tables drop_$${I}_database); \
+          chmod 755 create_$${I}_database update_$${I}_tables \
+             make_$${I}_tables grant_$${I}_privileges drop_$${I}_tables \
+             drop_$${I}_database); \
          done
-
        (cd src/qt-console; \
         chmod 755 install_conf_file build-depkgs-qt-console)