diff options
author | Tom Hukins <tom@FreeBSD.org> | 2001-07-07 19:42:25 +0000 |
---|---|---|
committer | Tom Hukins <tom@FreeBSD.org> | 2001-07-07 19:42:25 +0000 |
commit | fd23e4d892ba2dea6e88059d0bb8debbecdb9761 (patch) | |
tree | 9cd0b6f3f2e89a908793a31380cb82043be76670 | |
parent | Use variables instead of hardcoded version #'s in Makefile and (diff) |
Fix up problems due to earlier commit
Reviewed by: Mike Harding <mvh@ix.netcom.com>
Notes
Notes:
svn path=/head/; revision=44891
-rw-r--r-- | news/leafnode+/Makefile | 4 | ||||
-rw-r--r-- | news/leafnode+/files/patch-ac | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/news/leafnode+/Makefile b/news/leafnode+/Makefile index 7053b721b245..c84e9a43d198 100644 --- a/news/leafnode+/Makefile +++ b/news/leafnode+/Makefile @@ -21,9 +21,9 @@ PLIST= ${PKGDIR}/pkg-plist.nodocs .endif LEAFLIBDIR?= ${PREFIX}/lib/leafnode -SPOOLDIR?= /var/spool/leafnode +LEAFSPOOLDIR?= /var/spool/leafnode REWRITE= ${SED} -e "s:@LIBDIR@:${LEAFLIBDIR}:g" \ - -e "s:@SPOOLDIR@:${SPOOLDIR}:g" \ + -e "s:@SPOOLDIR@:${LEAFSPOOLDIR}:g" \ -e "s:@PREFIX@:${PREFIX}:g" post-patch: diff --git a/news/leafnode+/files/patch-ac b/news/leafnode+/files/patch-ac index 6649dca82505..2a40f77224e3 100644 --- a/news/leafnode+/files/patch-ac +++ b/news/leafnode+/files/patch-ac @@ -1,5 +1,5 @@ --- Makefile.orig Wed Jun 13 10:53:27 2001 -+++ Makefile Sat Jul 7 08:06:32 2001 ++++ Makefile Sat Jul 7 11:33:58 2001 @@ -11,19 +11,19 @@ #AR = ar #RANLIB = ranlib @@ -36,12 +36,12 @@ # # This is the directory where the news is stored. -SPOOLDIR = /var/spool/news -+#SPOOLDIR = /var/spool/news ++SPOOLDIR = @SPOOLDIR@ # # This is the directory where the configuration and group information is # kept. It should preferably not be on the same partition as spooldir -LIBDIR = /usr/lib/leafnode -+LIBDIR = LEAFLIBDIR ++LIBDIR = @LIBDIR@ # # These are about local library. LIBUTIL = libutil.a |