update for automake

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 9d717125f1d202afaca9316daf5c91e348082530..a4edf678d59f77b8ea7553b675fb14dd37b05af9 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -120,7 +120,6 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 MAGIC = $(pkgdatadir)/magic
-
 @FSECT5_TRUE@man_MAGIC = magic.5
 @FSECT5_FALSE@man_MAGIC = magic.4
 man_MANS = file.1 $(man_MAGIC) libmagic.3
@@ -135,11 +134,11 @@ DIST_SOURCES =
 
 NROFF = nroff
 MANS = $(man_MANS)
-DIST_COMMON = $(srcdir)/../Makefile.inc Makefile.am Makefile.in
+DIST_COMMON = Makefile.am Makefile.in
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am $(srcdir)/../Makefile.inc $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
        cd $(top_srcdir) && \
          $(AUTOMAKE) --gnu  doc/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
@@ -354,7 +353,6 @@ top_distdir = ..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-       $(mkinstalldirs) $(distdir)/./..
        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
        list='$(DISTFILES)'; for file in $$list; do \

diff --git a/src/Makefile.in b/src/Makefile.in
index 7a594e416fca2721ce61d21042194218b2c4816b..cc64db4610ee82c529850829fac27c1ae90e8245 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -119,6 +119,7 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+MAGIC = $(pkgdatadir)/magic
 lib_LTLIBRARIES = libmagic.la
 include_HEADERS = magic.h
 
@@ -512,7 +513,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \
        uninstall-includeHEADERS uninstall-info-am \
        uninstall-libLTLIBRARIES
 
-include "../Makefile.inc"
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: