From 79db4326858edc58158b2fd0241e71bd727e23a0 Mon Sep 17 00:00:00 2001 From: Tanaka Akira Date: Sat, 21 Aug 1999 05:46:19 +0000 Subject: manual/7459 --- Config/funcinst.mk | 2 ++ Config/installfns.sh | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'Config') diff --git a/Config/funcinst.mk b/Config/funcinst.mk index e473eb351..82f0c16a5 100644 --- a/Config/funcinst.mk +++ b/Config/funcinst.mk @@ -33,6 +33,7 @@ install.fns: FUNCTIONS_INSTALL="$(FUNCTIONS_INSTALL)" \ FUNCTIONS_SUBDIRS="$(FUNCTIONS_SUBDIRS)" \ INSTALL_DATA="$(INSTALL_DATA)" \ + DESTDIR="$(DESTDIR)" \ $(SHELL) $(sdir_top)/Config/installfns.sh || exit 1; \ fi; \ exit 0 @@ -42,6 +43,7 @@ uninstall.fns: fndir="$(fndir)" sdir="$(sdir)" \ FUNCTIONS_INSTALL="$(FUNCTIONS_INSTALL)" \ FUNCTIONS_SUBDIRS="$(FUNCTIONS_SUBDIRS)" \ + DESTDIR="$(DESTDIR)" \ $(SHELL) $(sdir_top)/Config/uninstallfns.sh || exit 1; \ fi; \ exit 0 diff --git a/Config/installfns.sh b/Config/installfns.sh index de7a52bce..2aa20bb32 100755 --- a/Config/installfns.sh +++ b/Config/installfns.sh @@ -4,7 +4,7 @@ if test -d $fndir.old; then add_old=1 fi -$sdir_top/mkinstalldirs $fndir || exit 1; +$sdir_top/mkinstalldirs $DESTDIR$fndir || exit 1; # If the source directory is somewhere else, we need to force # the shell to expand it in that directory, then strip it off. @@ -36,8 +36,8 @@ for file in $install; do : ${add_old:=1} fi fi - $sdir_top/mkinstalldirs $instdir || exit 1 - $INSTALL_DATA $sdir/$file $instdir || exit 1 + $sdir_top/mkinstalldirs $DESTDIR$instdir || exit 1 + $INSTALL_DATA $sdir/$file $DESTDIR$instdir || exit 1 fi done -- cgit 1.4.1