Misc -- see techlog

[bacula/bacula] / bacula / Makefile.in

diff --git a/bacula/Makefile.in b/bacula/Makefile.in
index d43c04318f81d183a01c5cfc7d5982425f8a7f1e..3d8ae498a890c22afa9055c0813695f02a8701e5 100755 (executable)
--- a/bacula/Makefile.in
+++ b/bacula/Makefile.in
@@ -15,12 +15,13 @@ thisdir = .
 first_rule: all
 dummy:
 
+# --client-only directories
 fd_subdirs = src scripts doc src/lib src/findlib src/filed \
-            rescue rescue/linux
+            @READLINE_SRC@ src/console rescue rescue/linux \
+            @GNOME_DIR@ @WX_DIR@
 
-
-subdirs =    src/cats @READLINE_SRC@ src/console src/dird \
-            src/stored @GNOME_DIR@ src/tools
+# Non-client-only directores
+subdirs =    src/cats src/dird src/stored src/tools
 
 all_subdirs = ${fd_subdirs} ${@ALL_DIRS@}
 
@@ -93,23 +94,23 @@ gnomedirs:
        $(MKDIR) $(DESTDIR)/etc/security/console.apps
        $(MKDIR) $(DESTDIR)/etc/pam.d
 
-install-menu: installdirs gnomedirs
+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: installdirs gnomedirs
+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: installdirs gnomedirs
+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)$(sbindir)/consolehelper $(DESTDIR)$(sbindir)/gnome-console
+       ln -s $(DESTDIR)/usr/bin/consolehelper $(DESTDIR)/usr/bin/gnome-console
 
 install: installdirs
        @for I in $(all_subdirs); do (cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1); done