From: Michael R Sweet Date: Sat, 10 May 2025 22:22:53 +0000 (-0400) Subject: Fix header.tmpl and associated makefiles for updated language stuff. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=abdfc20a3edcbbcf232e6a86deb5bb699c2f7273;p=thirdparty%2Fcups.git Fix header.tmpl and associated makefiles for updated language stuff. --- diff --git a/.gitignore b/.gitignore index 9cad022df8..e518b2200f 100644 --- a/.gitignore +++ b/.gitignore @@ -80,8 +80,6 @@ /cups/testthreads /cups/tlscheck /desktop/cups.desktop -/doc/index.html -/doc/*/index.html /filter/commandtops /filter/gziptoany /filter/pstops @@ -147,8 +145,6 @@ /systemv/lpmove /systemv/lpoptions /systemv/lpstat -/templates/header.tmpl -/templates/*/header.tmpl /test/cups-str-*.html /test/*_log-* /tools/cups-oauth diff --git a/configure b/configure index 83fd87d629..358b0ba394 100755 --- a/configure +++ b/configure @@ -649,8 +649,6 @@ ac_includes_default="\ ac_header_c_list= ac_subst_vars='LTLIBOBJS LIBOBJS -UNINSTALL_LANGUAGES -INSTALL_LANGUAGES TIMEOUTSTARTSEC EXIT_TIMEOUT SYSTEMD_WANTED_BY @@ -11941,35 +11939,7 @@ then : fi -INSTALL_LANGUAGES="" -UNINSTALL_LANGUAGES="" -LANGFILES="" -if test "x$LANGUAGES" != x -then : - - INSTALL_LANGUAGES="install-languages" - UNINSTALL_LANGUAGES="uninstall-languages" - for lang in $LANGUAGES; do - if test -f templates/$lang/header.tmpl.in -then : - - LANGFILES="$LANGFILES templates/$lang/header.tmpl" - -fi - done - -elif test "x$CUPS_BUNDLEDIR" != x -then : - - INSTALL_LANGUAGES="install-langbundle" - UNINSTALL_LANGUAGES="uninstall-langbundle" - -fi - - - - -ac_config_files="$ac_config_files Makedefs conf/cups-files.conf conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf cups.pc desktop/cups.desktop scheduler/cups-lpd.xinetd scheduler/cups.sh scheduler/cups.xml scheduler/org.cups.cups-lpd.plist scheduler/cups-lpdAT.service scheduler/cups.path scheduler/cups.service scheduler/cups.socket templates/header.tmpl packaging/cups.list $LANGFILES" +ac_config_files="$ac_config_files Makedefs conf/cups-files.conf conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf cups.pc desktop/cups.desktop scheduler/cups-lpd.xinetd scheduler/cups.sh scheduler/cups.xml scheduler/org.cups.cups-lpd.plist scheduler/cups-lpdAT.service scheduler/cups.path scheduler/cups.service scheduler/cups.socket packaging/cups.list" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -12674,9 +12644,7 @@ do "scheduler/cups.path") CONFIG_FILES="$CONFIG_FILES scheduler/cups.path" ;; "scheduler/cups.service") CONFIG_FILES="$CONFIG_FILES scheduler/cups.service" ;; "scheduler/cups.socket") CONFIG_FILES="$CONFIG_FILES scheduler/cups.socket" ;; - "templates/header.tmpl") CONFIG_FILES="$CONFIG_FILES templates/header.tmpl" ;; "packaging/cups.list") CONFIG_FILES="$CONFIG_FILES packaging/cups.list" ;; - "$LANGFILES") CONFIG_FILES="$CONFIG_FILES $LANGFILES" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/configure.ac b/configure.ac index 3e6650686e..6509bab392 100644 --- a/configure.ac +++ b/configure.ac @@ -45,27 +45,6 @@ AS_IF([test x$enable_shared = xno], [ PKGCONFIG_LIBS_STATIC="" ]) -dnl See what languages are available and make sure we generate the localization -dnl files as needed... -INSTALL_LANGUAGES="" -UNINSTALL_LANGUAGES="" -LANGFILES="" -AS_IF([test "x$LANGUAGES" != x], [ - INSTALL_LANGUAGES="install-languages" - UNINSTALL_LANGUAGES="uninstall-languages" - for lang in $LANGUAGES; do - AS_IF([test -f templates/$lang/header.tmpl.in], [ - LANGFILES="$LANGFILES templates/$lang/header.tmpl" - ]) - done -], [test "x$CUPS_BUNDLEDIR" != x], [ - INSTALL_LANGUAGES="install-langbundle" - UNINSTALL_LANGUAGES="uninstall-langbundle" -]) - -AC_SUBST([INSTALL_LANGUAGES]) -AC_SUBST([UNINSTALL_LANGUAGES]) - dnl Provide autoconf with a list of files to generate and output them... AC_CONFIG_FILES([ Makedefs @@ -84,8 +63,6 @@ AC_CONFIG_FILES([ scheduler/cups.path scheduler/cups.service scheduler/cups.socket - templates/header.tmpl packaging/cups.list - $LANGFILES ]) AC_OUTPUT diff --git a/doc/Makefile b/doc/Makefile index 38f2b4ce3b..93808bfa06 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -2,11 +2,9 @@ # Documentation makefile for CUPS. # # Copyright © 2020-2025 by OpenPrinting. -# Copyright © 2007-2019 by Apple Inc. -# Copyright © 1997-2007 by Easy Software Products. # # Licensed under Apache License v2.0. See the file "LICENSE" for more -#s information. +# information. # include ../Makedefs @@ -19,7 +17,6 @@ WEBPAGES = \ apple-touch-icon.png \ cups.css \ cups-printable.css \ - index.html \ robots.txt WEBIMAGES = \ images/cups.png \ @@ -154,7 +151,7 @@ install: all install-data install-headers install-libs install-exec # Install data files... # -install-data: $(INSTALL_LANGUAGES) +install-data: $(INSTALL_DIR) -m 755 $(DOCDIR) for file in $(WEBPAGES); do \ $(INSTALL_MAN) $$file $(DOCDIR); \ @@ -171,17 +168,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... @@ -208,7 +194,7 @@ install-libs: # Uninstall all documentation files... # -uninstall: $(UNINSTALL_LANGUAGES) +uninstall: for file in $(WEBPAGES); do \ $(RM) $(DOCDIR)/$$file; \ done @@ -224,12 +210,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 aa38ea401f..e32f8fb86a 100644 --- a/templates/Makefile +++ b/templates/Makefile @@ -128,13 +128,11 @@ install: all install-data install-headers install-libs install-exec # Install data files... # -install-data: $(INSTALL_LANGUAGES) +install-data: $(INSTALL_DIR) -m 755 $(DATADIR)/templates for file in $(FILES); do \ $(INSTALL_DATA) $$file $(DATADIR)/templates; \ done - -install-languages: for lang in $(LANGUAGES); do \ if test -d $$lang; then \ $(INSTALL_DIR) -m 755 $(DATADIR)/templates/$$lang; \ @@ -144,8 +142,6 @@ install-languages: fi \ done -install-langbundle: - # # Install programs... @@ -172,18 +168,14 @@ install-libs: # Uninstall files... # -uninstall: $(UNINSTALL_LANGUAGES) +uninstall: 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 - -uninstall-langbundle: + -$(RMDIR) $(DATADIR)/templates diff --git a/templates/da/header.tmpl.in b/templates/da/header.tmpl similarity index 100% rename from templates/da/header.tmpl.in rename to templates/da/header.tmpl diff --git a/templates/de/header.tmpl.in b/templates/de/header.tmpl similarity index 100% rename from templates/de/header.tmpl.in rename to templates/de/header.tmpl diff --git a/templates/es/header.tmpl.in b/templates/es/header.tmpl similarity index 100% rename from templates/es/header.tmpl.in rename to templates/es/header.tmpl diff --git a/templates/fr/header.tmpl.in b/templates/fr/header.tmpl similarity index 100% rename from templates/fr/header.tmpl.in rename to templates/fr/header.tmpl diff --git a/templates/header.tmpl.in b/templates/header.tmpl similarity index 100% rename from templates/header.tmpl.in rename to templates/header.tmpl diff --git a/templates/ja/header.tmpl.in b/templates/ja/header.tmpl similarity index 100% rename from templates/ja/header.tmpl.in rename to templates/ja/header.tmpl diff --git a/templates/pl/header.tmpl.in b/templates/pl/header.tmpl similarity index 100% rename from templates/pl/header.tmpl.in rename to templates/pl/header.tmpl diff --git a/templates/pt_BR/header.tmpl.in b/templates/pt_BR/header.tmpl similarity index 100% rename from templates/pt_BR/header.tmpl.in rename to templates/pt_BR/header.tmpl diff --git a/templates/ru/header.tmpl.in b/templates/ru/header.tmpl similarity index 100% rename from templates/ru/header.tmpl.in rename to templates/ru/header.tmpl diff --git a/templates/sv/header.tmpl.in b/templates/sv/header.tmpl similarity index 100% rename from templates/sv/header.tmpl.in rename to templates/sv/header.tmpl