No longer run through sed

diff --git a/data.am b/data.am
index f58e568..2266c1f 100644 (file)
--- a/data.am
+++ b/data.am
@@ -1,15 +1,11 @@
-install:: install-@SHORT@data
-
-# We use a funny name because "install-data" has another meaning.
-install-@SHORT@data: @LONG@
-       $(top_srcdir)/mkinstalldirs @DIR@
-       for p in @LONG@; do                     \
-         $(INSTALL_DATA) $(srcdir)/$$p @DIR@/$$p; \
+install-ddata: $(DATA)
+       $(top_srcdir)/mkinstalldirs $(datadir)
+       for p in $(DATA); do                    \
+         $(INSTALL_DATA) $(srcdir)/$$p $(datadir)/$$p; \
        done
 
-uninstall:: install-@SHORT@data
+uninstall-ddata:
+       for p in $(DATA); do                    \
+         rm -f $(datadir)/$$p;                 \
+       done
 
-uninstall-@SHORT@data:
-       for p in @LONG@; do                     \
-         rm -f @DIR@/$$p;                      \
-       done
\ No newline at end of file

diff --git a/lib/am/data.am b/lib/am/data.am
index f58e568..2266c1f 100644 (file)
--- a/lib/am/data.am
+++ b/lib/am/data.am
@@ -1,15 +1,11 @@
-install:: install-@SHORT@data
-
-# We use a funny name because "install-data" has another meaning.
-install-@SHORT@data: @LONG@
-       $(top_srcdir)/mkinstalldirs @DIR@
-       for p in @LONG@; do                     \
-         $(INSTALL_DATA) $(srcdir)/$$p @DIR@/$$p; \
+install-ddata: $(DATA)
+       $(top_srcdir)/mkinstalldirs $(datadir)
+       for p in $(DATA); do                    \
+         $(INSTALL_DATA) $(srcdir)/$$p $(datadir)/$$p; \
        done
 
-uninstall:: install-@SHORT@data
+uninstall-ddata:
+       for p in $(DATA); do                    \
+         rm -f $(datadir)/$$p;                 \
+       done
 
-uninstall-@SHORT@data:
-       for p in @LONG@; do                     \
-         rm -f @DIR@/$$p;                      \
-       done
\ No newline at end of file