Merge pull request #1362 from zdohnal/install_lang

Makefile: Install localized templates and homepages

Author: zdohnal

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:

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