From fd66ec9f6aa16d3aa8855da381e2502e6f5ca3b1 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Tue, 21 Jul 2009 13:26:04 +1200 Subject: [PATCH] Install TRANSLATORS and COPYRIGHT in errors/ with other files. In theory this will fix: install: ./TRANSLATORS and TRANSLATORS are the same file *** Error code 64 --- errors/Makefile.am | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/errors/Makefile.am b/errors/Makefile.am index cac8dab20c..a25a33e6e9 100644 --- a/errors/Makefile.am +++ b/errors/Makefile.am @@ -10,10 +10,11 @@ errordir = $(datadir)/errors DEFAULT_ERROR_DIR = $(errordir) DEFAULT_STYLESHEET = $(sysconfdir)/errorpage.css -# List of automated translations possible: +## List of automated translations possible: TRANSLATIONPO=`ls -1 $(top_srcdir)/errors/*.po | grep -o -E "[a-z\-]+\.po" | sed s/.po//` TRANSLATIONDIR=`ls -1 $(srcdir) $(builddir) | sed -e 's%$(srcdir)/%%' -e 's%$(builddir)/%%' -e 's%.po%%' ` +## TODO: prevent this loop installing everything twice when srcdir == builddir install-data-local: for l in $(TRANSLATIONDIR) ; do \ echo "Located $$l for install..."; \ @@ -32,8 +33,8 @@ install-data-local: done; \ fi \ done; \ - $(INSTALL_DATA) $(srcdir)/TRANSLATORS $(DESTDIR)TRANSLATORS; \ - $(INSTALL_DATA) $(srcdir)/COPYRIGHT $(DESTDIR)COPYRIGHT; \ + $(INSTALL_DATA) $(srcdir)/TRANSLATORS $(DESTDIR)$(DEFAULT_ERROR_DIR)/TRANSLATORS; \ + $(INSTALL_DATA) $(srcdir)/COPYRIGHT $(DESTDIR)$(DEFAULT_ERROR_DIR)/COPYRIGHT; \ $(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET).default; \ if test -f $(DESTDIR)$(DEFAULT_STYLESHEET) ; then \ echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_STYLESHEET)" ; \ @@ -64,8 +65,8 @@ uninstall-local: done; @$(SHELL) $(top_srcdir)/scripts/remove-cfg.sh "$(RM)" $(DESTDIR)$(DEFAULT_STYLESHEET) rm -f $(DESTDIR)$(DEFAULT_STYLESHEET).default - rm -f $(DESTDIR)TRANSLATORS - rm -f $(DESTDIR)COPYRIGHT + rm -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/TRANSLATORS + rm -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/COPYRIGHT ## Upgrade requires the new files to be pre-installed upgrade: install -- 2.47.3