states/hl/Makefile.am: New hldir variable to replace local install rules.

diff --git a/states/hl/ChangeLog b/states/hl/ChangeLog
index d90aa11f85a45f2fa1160bff84eafd3c14d8a183..aea053099590b46ec816ba99364f3663821b48c2 100644 (file)
--- a/states/hl/ChangeLog
+++ b/states/hl/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-03  Tim Retout  <diocles@gnu.org>
+
+       * Makefile.am (install-data-local): Remove.
+       (uninstall-local): Likewise.
+       (EXTRA_DIST): Likewise.
+       (hldir): New variable for location of highlighting files.
+       (dist_hl_DATA): New variable with previous contents of EXTRA_DIST.
+
 2008-01-29  Tim Retout  <diocles@gnu.org>
 
        * Makefile.am (install-data-local): Use $(DESTDIR) in local

diff --git a/states/hl/Makefile.am b/states/hl/Makefile.am
index 734989b80ebb5e58b5f7230d1a743ddc538e217f..398736fa9477bc0650d8be830f141dd1ddc73589 100644 (file)
--- a/states/hl/Makefile.am
+++ b/states/hl/Makefile.am
@@ -40,16 +40,6 @@ postscript.st python.st pyrex.st rfc.st scheme.st sh.st skill.st     \
 sql.st states.st synopsys.st tcl.st tcsh.st tex.st vba.st verilog.st   \
 vhdl.st vrml.st wmlscript.st zsh.st
 
-states = $(misc) $(styles) $(languages) $(highlightings)
+hldir = $(pkgdatadir)/hl
+dist_hl_DATA = $(misc) $(styles) $(languages) $(highlightings)
 
-EXTRA_DIST = $(states)
-
-install-data-local:
-       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/enscript
-       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/enscript/hl
-       for f in $(states); do \
-         $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(datadir)/enscript/hl/$$f; \
-       done
-
-uninstall-local:
-       rm -rf $(DESTDIR)$(datadir)/enscript/hl