summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorChristos Zoulas <christos@zoulas.com>2003-03-24 14:51:57 +0000
committerChristos Zoulas <christos@zoulas.com>2003-03-24 14:51:57 +0000
commitbaae79b5cfca29a8505390d47ea876a51952c428 (patch)
tree77aae34c0a7dd0bb8e431ca377fff4b2c16f759c /doc
parent875bf716ddfc1a80590e0d532917067401ca707f (diff)
downloadfile-git-baae79b5cfca29a8505390d47ea876a51952c428.tar.gz
back to the previous
Diffstat (limited to 'doc')
-rw-r--r--doc/Makefile.am3
-rw-r--r--doc/Makefile.in7
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4f72d6b9..4a78589c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,4 @@
-include ../Makefile.inc
-
+MAGIC = $(pkgdatadir)/magic
if FSECT5
man_MAGIC = magic.5
else
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 8c693853..9d717125 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -119,8 +119,8 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+MAGIC = $(pkgdatadir)/magic
-MAGIC = $(datadir)/magic
@FSECT5_TRUE@man_MAGIC = magic.5
@FSECT5_FALSE@man_MAGIC = magic.4
man_MANS = file.1 $(man_MAGIC) libmagic.3
@@ -135,11 +135,11 @@ DIST_SOURCES =
NROFF = nroff
MANS = $(man_MANS)
-DIST_COMMON = Makefile.am Makefile.in
+DIST_COMMON = $(srcdir)/../Makefile.inc Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: Makefile.am $(srcdir)/../Makefile.inc $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu doc/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -354,6 +354,7 @@ 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 \