CUPS doesn't install all the localization directories and files

[michaelrsweet]

Version: 1.4-current
CUPS.org User: riopedre

'make install' doesn't create '$(DOCDIR)/es' (for example) directory and it also doesn't copy 'doc/es/index.html' to '$(DOCDIR)/es/index.html'. After repairing this, it also make an empty '$(DOCDIR)/es/images' subdirectory.

Attached patch repairs this and also changes a mistake in a comment line.

[michaelrsweet]

CUPS.org User: mike

Fixed in Subversion repository.

[michaelrsweet]

"Makefile_doc.patch":

--- old/cups-1.4b2/doc/Makefile 2008-11-14 20:32:22.000000000 +0100
+++ new/cups-1.4b2/doc/Makefile 2008-12-17 11:07:45.000000000 +0100
@@ -165,7 +165,7 @@

Install data files...

-install-data:
+install-data: $(INSTALL_LANGUAGES)
$(INSTALL_DIR) -m 755 $(DOCDIR)
for file in $(WEBPAGES); do
$(INSTALL_MAN) $$file $(DOCDIR);
@@ -182,13 +182,8 @@
install-languages:
for lang in $(LANGUAGES); do
if test -d $$lang; then \

•       $(INSTALL_DIR) -m 755 $(DOCDIR)/$$lang/images; \
  

•       $(INSTALL_DIR) -m 755 $(DOCDIR)/$$lang; \
      $(INSTALL_MAN) $$lang/index.html $(DOCDIR)/$$lang; \
  

•       $(INSTALL_MAN) $$lang/cups.css $(DOCDIR)/$$lang 2>/dev/null || true; \
  

•       $(INSTALL_DIR) -m 755 $(DOCDIR)/$$lang/images; \
  

•       for file in $(WEBIMAGES); do \
  

•           $(INSTALL_MAN) $$lang/$$file $(DOCDIR)/$$lang/images 2>/dev/null || true; \
  

•       done; \
  fi; \
  

  done

@@ -215,7 +210,7 @@

-# Unnstall all documentation files...
+# Uninstall all documentation files...

uninstall: $(UNINSTALL_LANGUAGES)
@@ -235,11 +230,6 @@
uninstall-languages:
-for lang in $(LANGUAGES); do
$(RM) $(DOCDIR)/$$lang/index.html; \

•   $(RM) $(DOCDIR)/$$lang/cups.css; \
  

•   for file in $(WEBIMAGES); do \
  

•       $(RM) $(DOCDIR)/$$lang/$$file; \
  

•   done; \
  

•   $(RMDIR) $(DOCDIR)/$$lang/images; \
  $(RMDIR) $(DOCDIR)/$$lang; \
  

  done

[michaelrsweet]

"str3040.patch":

Index: doc/Makefile

--- doc/Makefile (revision 8214)
+++ doc/Makefile (working copy)
@@ -165,7 +165,7 @@

Install data files...

-install-data:
+install-data: $(INSTALL_LANGUAGES)
$(INSTALL_DIR) -m 755 $(DOCDIR)
for file in $(WEBPAGES); do
$(INSTALL_MAN) $$file $(DOCDIR);
@@ -182,13 +182,9 @@
install-languages:
for lang in $(LANGUAGES); do
if test -d $$lang; then \

•       $(INSTALL_DIR) -m 755 $(DOCDIR)/$$lang/images; \
  

•       $(INSTALL_DIR) -m 755 $(DOCDIR)/$$lang; \
      $(INSTALL_MAN) $$lang/index.html $(DOCDIR)/$$lang; \
      $(INSTALL_MAN) $$lang/cups.css $(DOCDIR)/$$lang 2>/dev/null || true; \
  

•       $(INSTALL_DIR) -m 755 $(DOCDIR)/$$lang/images; \
  

•       for file in $(WEBIMAGES); do \
  

•           $(INSTALL_MAN) $$lang/$$file $(DOCDIR)/$$lang/images 2>/dev/null || true; \
  

•       done; \
  fi; \
  

  done

@@ -215,7 +211,7 @@

-# Unnstall all documentation files...
+# Uninstall all documentation files...

uninstall: $(UNINSTALL_LANGUAGES)
@@ -236,10 +232,6 @@
-for lang in $(LANGUAGES); do
$(RM) $(DOCDIR)/$$lang/index.html;
$(RM) $(DOCDIR)/$$lang/cups.css; \

•   for file in $(WEBIMAGES); do \
  

•       $(RM) $(DOCDIR)/$$lang/$$file; \
  

•   done; \
  

•   $(RMDIR) $(DOCDIR)/$$lang/images; \
  $(RMDIR) $(DOCDIR)/$$lang; \
  

  done