Makefile: Install localized templates and homepages

The mentioned files were not installed because commit b8e942ede6b3 did
not update Makefile in doc and templates to work after INSTALL_LANGUAGES
is removed.

diff --git a/doc/Makefile b/doc/Makefile
index 89ec7c729d491830a68fc8b9aa4d8a2a0f732f1f..90e7f48f21a03ea7101cd4977903a1a0f88ba280 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -153,7 +153,14 @@ install:   all install-data install-headers install-libs install-exec
 # Install data files...
 #
 
-install-data: $(INSTALL_LANGUAGES)
+install-data:
+       for lang in $(LANGUAGES); do \
+               if test -d $$lang; then \
+                       $(INSTALL_DIR) -m 755 $(DOCDIR)/$$lang; \
+                       $(INSTALL_DATA) $$lang/index.html $(DOCDIR)/$$lang; \
+                       $(INSTALL_DATA) $$lang/cups.css $(DOCDIR)/$$lang >/dev/null 2>&1 || true; \
+               fi; \
+       done
        $(INSTALL_DIR) -m 755 $(DOCDIR)
        for file in $(WEBPAGES); do \
                $(INSTALL_MAN) $$file $(DOCDIR); \
@@ -170,17 +177,6 @@ install-data: $(INSTALL_LANGUAGES)
                $(INSTALL_MAN) $$file $(DOCDIR)/images; \
        done
 
-install-languages:
-       for lang in $(LANGUAGES); do \
-               if test -d $$lang; then \
-                       $(INSTALL_DIR) -m 755 $(DOCDIR)/$$lang; \
-                       $(INSTALL_DATA) $$lang/index.html $(DOCDIR)/$$lang; \
-                       $(INSTALL_DATA) $$lang/cups.css $(DOCDIR)/$$lang >/dev/null 2>&1 || true; \
-               fi; \
-       done
-
-install-langbundle:
-
 
 #
 # Install programs...
@@ -207,7 +203,12 @@ install-libs:
 # Uninstall all documentation files...
 #
 
-uninstall: $(UNINSTALL_LANGUAGES)
+uninstall:
+       -for lang in $(LANGUAGES); do \
+               $(RM) $(DOCDIR)/$$lang/index.html; \
+               $(RM) $(DOCDIR)/$$lang/cups.css; \
+               $(RMDIR) $(DOCDIR)/$$lang; \
+       done
        for file in $(WEBPAGES); do \
                $(RM) $(DOCDIR)/$$file; \
        done
@@ -223,12 +224,3 @@ uninstall: $(UNINSTALL_LANGUAGES)
        -$(RMDIR) $(DOCDIR)/images
        -$(RMDIR) $(DOCDIR)/help
        -$(RMDIR) $(DOCDIR)
-
-uninstall-languages:
-       -for lang in $(LANGUAGES); do \
-               $(RM) $(DOCDIR)/$$lang/index.html; \
-               $(RM) $(DOCDIR)/$$lang/cups.css; \
-               $(RMDIR) $(DOCDIR)/$$lang; \
-       done
-
-install-langbundle:

diff --git a/templates/Makefile b/templates/Makefile
index ba4919a58c8f5dea27f6bf03207f4555b7236b2b..26dc4c3d368bc5a267cbcc133bf68654ebf674c6 100644 (file)
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -128,13 +128,7 @@ install:   all install-data install-headers install-libs install-exec
 # Install data files...
 #
 
-install-data: $(INSTALL_LANGUAGES)
-       $(INSTALL_DIR) -m 755 $(DATADIR)/templates
-       for file in $(FILES); do \
-               $(INSTALL_DATA) $$file $(DATADIR)/templates; \
-       done
-
-install-languages:
+install-data:
        for lang in $(LANGUAGES); do \
                if test -d $$lang; then \
                        $(INSTALL_DIR) -m 755 $(DATADIR)/templates/$$lang; \
@@ -143,8 +137,10 @@ install-languages:
                        done \
                fi \
        done
-
-install-langbundle:
+       $(INSTALL_DIR) -m 755 $(DATADIR)/templates
+       for file in $(FILES); do \
+               $(INSTALL_DATA) $$file $(DATADIR)/templates; \
+       done
 
 
 #
@@ -172,18 +168,14 @@ install-libs:
 # Uninstall files...
 #
 
-uninstall: $(UNINSTALL_LANGUAGES)
-       for file in $(FILES); do \
-               $(RM) $(DATADIR)/templates/$$file; \
-       done
-       -$(RMDIR) $(DATADIR)/templates
-
-uninstall-languages:
+uninstall:
        for lang in $(LANGUAGES); do \
                for file in $(FILES); do \
                        $(RM) $(DATADIR)/templates/$$lang/$$file; \
                done \
                $(RMDIR) $(DATADIR)/templates/$$lang; \
        done
-
-uninstall-langbundle:
+       for file in $(FILES); do \
+               $(RM) $(DATADIR)/templates/$$file; \
+       done
+       -$(RMDIR) $(DATADIR)/templates