install in pkgdatadir not datadir

diff --git a/magic/Makefile.am b/magic/Makefile.am
index a1a1a06c5b23096355bc6186f4b8800c3ab3e6a0..21f549a3e70bcbc409a7fa524598bb16af3576d2 100644 (file)
--- a/magic/Makefile.am
+++ b/magic/Makefile.am
@@ -1,4 +1,4 @@
-data_DATA = magic magic.mime magic.mgc magic.mime.mgc
+pkgdata_DATA = magic magic.mime magic.mgc magic.mime.mgc
 
 EXTRA_DIST = magic2mime Localstuff Header magic.mime $(magic_FRAGMENTS)
 

diff --git a/magic/Makefile.in b/magic/Makefile.in
index 958ef24110ec31315f0188c95fbc7cb4e19d1573..3f20508eccbbef8ccc61da6a836c52077165c756 100644 (file)
--- a/magic/Makefile.in
+++ b/magic/Makefile.in
@@ -119,7 +119,7 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-data_DATA = magic magic.mime magic.mgc magic.mime.mgc
+pkgdata_DATA = magic magic.mime magic.mgc magic.mime.mgc
 
 EXTRA_DIST = magic2mime Localstuff Header magic.mime $(magic_FRAGMENTS)
 
@@ -292,7 +292,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
-DATA = $(data_DATA)
+DATA = $(pkgdata_DATA)
 
 DIST_COMMON = Makefile.am Makefile.in
 all: all-am
@@ -313,23 +313,23 @@ clean-libtool:
 distclean-libtool:
        -rm -f libtool
 uninstall-info-am:
-dataDATA_INSTALL = $(INSTALL_DATA)
-install-dataDATA: $(data_DATA)
+pkgdataDATA_INSTALL = $(INSTALL_DATA)
+install-pkgdataDATA: $(pkgdata_DATA)
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(datadir)
-       @list='$(data_DATA)'; for p in $$list; do \
+       $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+       @list='$(pkgdata_DATA)'; for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          f="`echo $$p | sed -e 's|^.*/||'`"; \
-         echo " $(dataDATA_INSTALL) $$d$$p $(DESTDIR)$(datadir)/$$f"; \
-         $(dataDATA_INSTALL) $$d$$p $(DESTDIR)$(datadir)/$$f; \
+         echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
+         $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
        done
 
-uninstall-dataDATA:
+uninstall-pkgdataDATA:
        @$(NORMAL_UNINSTALL)
-       @list='$(data_DATA)'; for p in $$list; do \
+       @list='$(pkgdata_DATA)'; for p in $$list; do \
          f="`echo $$p | sed -e 's|^.*/||'`"; \
-         echo " rm -f $(DESTDIR)$(datadir)/$$f"; \
-         rm -f $(DESTDIR)$(datadir)/$$f; \
+         echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
+         rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
        done
 tags: TAGS
 TAGS:
@@ -375,7 +375,7 @@ check: check-am
 all-am: Makefile $(DATA)
 
 installdirs:
-       $(mkinstalldirs) $(DESTDIR)$(datadir)
+       $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
 
 install: install-am
 install-exec: install-exec-am
@@ -418,7 +418,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-dataDATA
+install-data-am: install-pkgdataDATA
 
 install-exec-am:
 
@@ -444,17 +444,17 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-dataDATA uninstall-info-am
+uninstall-am: uninstall-info-am uninstall-pkgdataDATA
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
        distclean distclean-generic distclean-libtool distdir dvi \
        dvi-am info info-am install install-am install-data \
-       install-data-am install-dataDATA install-exec install-exec-am \
-       install-info install-info-am install-man install-strip \
+       install-data-am install-exec install-exec-am install-info \
+       install-info-am install-man install-pkgdataDATA install-strip \
        installcheck installcheck-am installdirs maintainer-clean \
        maintainer-clean-generic mostlyclean mostlyclean-generic \
        mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-       uninstall-dataDATA uninstall-info-am
+       uninstall-info-am uninstall-pkgdataDATA
 
 
 magic: Header Localstuff $(magic_FRAGMENTS)