From 793cf3d1c05dc8e2d971b1c6f233589b0473864a Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 28 Jun 2006 18:19:32 +0000 Subject: [PATCH] Fix make distcheck . --- doc/Makefile.am | 10 +++++----- index/Makefile.am | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index a81a3ec..1ab03f1 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.52 2006-06-28 13:26:13 adam Exp $ +## $Id: Makefile.am,v 1.53 2006-06-28 18:19:32 adam Exp $ docdir=$(datadir)/doc/$(PACKAGE)$(PACKAGE_SUFFIX) SUBDIRS = common @@ -134,7 +134,7 @@ clean-data-hook: rm -f [0-9]* *.bak dist-hook: - for f in *.html; do \ + if test -f index.html; then for f in *.html; do \ found=0; \ b=`basename $$f`; \ for h in $(HTMLFILES); do \ @@ -146,8 +146,8 @@ dist-hook: echo "$$f not found in HTMLFILES"; \ exit 1; \ fi \ - done + done; fi install-data-hook: - cd $(man1dir) && ln -sf zebraidx$(PACKAGE_SUFFIX).1 zebraidx.1 - cd $(man8dir) && ln -sf zebrasrv$(PACKAGE_SUFFIX).8 zebrasrv.8 + cd $(DESTDIR)$(man1dir) && ln -sf zebraidx$(PACKAGE_SUFFIX).1 zebraidx.1 + cd $(DESTDIR)$(man8dir) && ln -sf zebrasrv$(PACKAGE_SUFFIX).8 zebrasrv.8 diff --git a/index/Makefile.am b/index/Makefile.am index 7a0a6d8..1c0778e 100644 --- a/index/Makefile.am +++ b/index/Makefile.am @@ -1,4 +1,4 @@ -## $Id: Makefile.am,v 1.43 2006-06-28 13:26:16 adam Exp $ +## $Id: Makefile.am,v 1.44 2006-06-28 18:19:32 adam Exp $ noinst_PROGRAMS = apitest kdump zebrash @@ -51,11 +51,11 @@ zebrash_LDADD= $(zebralibs) $(YAZLALIB) $(READLINE_LIBS) LDADD = $(zebralibs) $(YAZLALIB) install-exec-hook: - cd $(bindir) && mv -f zebraidx zebraidx$(PACKAGE_SUFFIX) - cd $(bindir) && ln -sf zebraidx$(PACKAGE_SUFFIX) zebraidx - cd $(bindir) && mv -f zebrasrv zebrasrv$(PACKAGE_SUFFIX) - cd $(bindir) && ln -sf zebrasrv$(PACKAGE_SUFFIX) zebrasrv + cd $(DESTDIR)$(bindir) && mv -f zebraidx zebraidx$(PACKAGE_SUFFIX) + cd $(DESTDIR)$(bindir) && ln -sf zebraidx$(PACKAGE_SUFFIX) zebraidx + cd $(DESTDIR)$(bindir) && mv -f zebrasrv zebrasrv$(PACKAGE_SUFFIX) + cd $(DESTDIR)$(bindir) && ln -sf zebrasrv$(PACKAGE_SUFFIX) zebrasrv uninstall-hook: - cd $(bindir) && rm -f zebraidx$(PACKAGE_SUFFIX) - cd $(bindir) && rm -f zebrasrv$(PACKAGE_SUFFIX) + cd $(DESTDIR)$(bindir) && rm -f zebraidx$(PACKAGE_SUFFIX) + cd $(DESTDIR)$(bindir) && rm -f zebrasrv$(PACKAGE_SUFFIX) -- 1.7.10.4