Fix installs when all localizations are disabled.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@5608 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/Makedefs.in b/Makedefs.in
index 41a9b2a20da00bbf77c17812b055cd9b10264e13..961a5e95783c98b19726ce0f39ffaeed7452c055 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -78,6 +78,8 @@ CUPS_LOG_FILE_PERM = @CUPS_LOG_FILE_PERM@
 #
 
 LANGUAGES      =       @LANGUAGES@
+INSTALL_LANGUAGES =    @INSTALL_LANGUAGES@
+UNINSTALL_LANGUAGES =  @UNINSTALL_LANGUAGES@
 
 #
 # Libraries...

diff --git a/configure.in b/configure.in
index 9969eb6172a0da1f1e095643e2f7f602092cb67d..2b406cfabc12b4ca2f38736b628e02f3da276873 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -47,8 +47,12 @@ sinclude(config-scripts/cups-pap.m4)
 sinclude(config-scripts/cups-pdf.m4)
 sinclude(config-scripts/cups-scripting.m4)
 
+INSTALL_LANGUAGES=""
+UNINSTALL_LANGUAGES=""
 LANGFILES=""
 if test "x$LANGUAGES" != x; then
+       INSTALL_LANGUAGES="install-languages"
+       UNINSTALL_LANGUAGES="uninstall-languages"
        for lang in $LANGUAGES; do
                LANGFILES="$LANGFILES doc/$lang/index.html"
                LANGFILES="$LANGFILES templates/$lang/edit-config.tmpl"
@@ -56,6 +60,9 @@ if test "x$LANGUAGES" != x; then
        done
 fi
 
+AC_SUBST(INSTALL_LANGUAGES)
+AC_SUBST(UNINSTALL_LANGUAGES)
+
 AC_OUTPUT(Makedefs packaging/cups.list init/cups.sh init/cups-lpd cups-config
          conf/cupsd.conf conf/pam.std doc/index.html
          doc/help/standard.html man/client.conf.man

diff --git a/doc/Makefile b/doc/Makefile
index 3009340449255272193702d2095793b323fe1316..ff1f1d249585fd9df55576811e4ba17883892f71 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -201,7 +201,7 @@ depend:
 # Install all documentation files...
 #
 
-install:       all
+install:       all $(INSTALL_LANGUAGES)
        $(INSTALL_DIR) -m 755 $(DOCDIR)
        for file in $(WEBPAGES); do \
                $(INSTALL_MAN) $$file $(DOCDIR); \
@@ -214,6 +214,8 @@ install:    all
        for file in $(WEBIMAGES) $(WEBBUTTONS); do \
                $(INSTALL_MAN) $$file $(DOCDIR)/images; \
        done
+
+install-languages:
        for lang in $(LANGUAGES); do \
                $(INSTALL_DIR) -m 755 $(DOCDIR)/$$lang/images; \
                if test -f $$lang/index.html; then \
@@ -231,7 +233,7 @@ install:    all
 # Unnstall all documentation files...
 #
 
-uninstall:
+uninstall: $(UNINSTALL_LANGUAGES)
        for file in $(WEBPAGES); do \
                $(RM) $(DOCDIR)/$$file; \
        done
@@ -241,6 +243,11 @@ uninstall:
        for file in $(WEBIMAGES) $(WEBBUTTONS); do \
                $(INSTALL_MAN) $(DOCDIR)/images/$$file; \
        done
+       -$(RMDIR) $(DOCDIR)/images
+       -$(RMDIR) $(DOCDIR)/help
+       -$(RMDIR) $(DOCDIR)
+
+uninstall-languages:
        -for lang in $(LANGUAGES); do \
                $(RM) $(DOCDIR)/$$lang/index.html; \
                for file in $(WEBBUTTONS); do \
@@ -249,9 +256,6 @@ uninstall:
                $(RMDIR) $(DOCDIR)/$$lang/images; \
                $(RMDIR) $(DOCDIR)/$$lang; \
        done
-       -$(RMDIR) $(DOCDIR)/images
-       -$(RMDIR) $(DOCDIR)/help
-       -$(RMDIR) $(DOCDIR)
 
 
 #

diff --git a/locale/Makefile b/locale/Makefile
index 65831181612193b5e0cc6a5e17cd3b81666bc625..34bcf1b953f1aa5956634b87c8334cb7d0a4455a 100644 (file)
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -51,7 +51,9 @@ depend:
 # Install files...
 #
 
-install:       all
+install:       all $(INSTALL_LANGUAGES)
+
+install-languages:
        $(INSTALL_DIR) -m 755 $(LOCALEDIR)
        for loc in $(LANGUAGES) ; do \
                if test -f cups_$$loc.po; then \
@@ -65,12 +67,12 @@ install:    all
 # Uninstall files...
 #
 
-uninstall:
+uninstall: $(UNINSTALL_LANGUAGES)
+
+uninstall-languages:
        -for loc in $(LANGUAGES) ; do \
                $(RM) $(LOCALEDIR)/$$loc/cups_$$loc.po ; \
-               $(RMDIR) $(LOCALEDIR)/$$loc ; \
        done
-       -$(RMDIR) $(LOCALEDIR)
 
 
 #

diff --git a/templates/Makefile b/templates/Makefile
index 2c16f8977d2f62cc1715c13e691a2706b6e56915..ba629947d7360934baa742ea62f75ec4bf1936a6 100644 (file)
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -118,11 +118,13 @@ depend:
 # Install files...
 #
 
-install: all
+install: all $(INSTALL_LANGUAGES)
        $(INSTALL_DIR) -m 755 $(DATADIR)/templates
        for file in $(FILES); do \
                $(INSTALL_DATA) $$file $(DATADIR)/templates; \
        done
+
+install-languages:
        for lang in $(LANGUAGES); do \
                $(INSTALL_DIR) -m 755 $(DATADIR)/templates/$$lang; \
                for file in $(FILES); do \
@@ -137,17 +139,19 @@ install: all
 # Uninstall files...
 #
 
-uninstall:
+uninstall: $(UNINSTALL_LANGUAGES)
        for file in $(FILES); do \
                $(RM) $(DATADIR)/templates/$$file; \
        done
+       -$(RMDIR) $(DATADIR)/templates
+
+uninstall-languages:
        for lang in $(LANGUAGES); do \
                for file in $(FILES); do \
                        $(RM) $(DATADIR)/templates/$$lang/$$file; \
                done \
                $(RMDIR) $(DATADIR)/templates/$$lang; \
        done
-       -$(RMDIR) $(DATADIR)/templates
 
 
 #