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

diff --git a/errors/Makefile.am b/errors/Makefile.am
index cac8dab20c4b4eb789659d2ad2399cb4b04021e5..a25a33e6e9249fb4e1d369cd78def52647f0a8ac 100644 (file)
--- 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