fix configuration file path and respect CFLAGS

Submitted by:	Sybolt de Boer <bolt@xs4all.nl> (via private mail)
This commit is contained in:
Ying-Chieh Liao 2001-01-29 02:03:50 +00:00
parent 9251523cf9
commit c6b3241579
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=37714
6 changed files with 24 additions and 16 deletions

View file

@ -24,7 +24,9 @@ post-patch:
.for file in logtool/Makefile logtail/Makefile
@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${file}
.endfor
@${PERL} -pi -e "s|/etc|${PREFIX}/etc|g" ${WRKSRC}/logtool/config.h
.for file in logtool/config.h conf/logtool.conf
@${PERL} -pi -e "s|/etc|${PREFIX}/etc|g" ${WRKSRC}/${file}
.endfor
post-install:
.if !defined(NOPORTDOCS)

View file

@ -1,5 +1,5 @@
--- logtool/Makefile.orig Sat Jan 13 14:56:21 2001
+++ logtool/Makefile Sat Jan 13 14:58:01 2001
--- logtool/Makefile.orig Wed Jan 10 08:27:16 2001
+++ logtool/Makefile Sun Jan 28 22:36:49 2001
@@ -9,8 +9,8 @@
csv.o html.o raw.o logtool.o main.o
SRC = logtool.c
@ -16,7 +16,7 @@
# For RedHat (and most other) Linux'es, this should be ideal
-CFLAGS= -Wall -O3 -ansi -pedantic -Werror # -DDEBUG -g # uncomment this for debugging stuff's
+CFLAGS= -I/usr/local/include -Wall -O3 -ansi -pedantic -Werror # -DDEBUG -g # uncomment this for debugging stuff's
+CFLAGS+= -I/usr/local/include -Wall -ansi -pedantic -Werror # -DDEBUG -g # uncomment this for debugging stuff's
+LIBS= -L/usr/local/lib -lgnugetopt
# For portability to non-linux'es/non-standard-linux'es, try this

View file

@ -1,10 +1,12 @@
--- logtail/Makefile.orig Sat Dec 30 20:17:09 2000
+++ logtail/Makefile Sat Dec 30 20:17:35 2000
@@ -2,7 +2,7 @@
--- logtail/Makefile.orig Mon Dec 25 19:24:25 2000
+++ logtail/Makefile Sun Jan 28 22:40:44 2001
@@ -1,8 +1,8 @@
SRC= logtail.c
PROG= logtail
CC= gcc
CFLAGS= -Wall -Werror -O3 -ansi -pedantic
-CFLAGS= -Wall -Werror -O3 -ansi -pedantic
-PREFIX=/usr
+CFLAGS+= -Wall -Werror -ansi -pedantic
+PREFIX=%%PREFIX%%
default:

View file

@ -24,7 +24,9 @@ post-patch:
.for file in logtool/Makefile logtail/Makefile
@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${file}
.endfor
@${PERL} -pi -e "s|/etc|${PREFIX}/etc|g" ${WRKSRC}/logtool/config.h
.for file in logtool/config.h conf/logtool.conf
@${PERL} -pi -e "s|/etc|${PREFIX}/etc|g" ${WRKSRC}/${file}
.endfor
post-install:
.if !defined(NOPORTDOCS)

View file

@ -1,5 +1,5 @@
--- logtool/Makefile.orig Sat Jan 13 14:56:21 2001
+++ logtool/Makefile Sat Jan 13 14:58:01 2001
--- logtool/Makefile.orig Wed Jan 10 08:27:16 2001
+++ logtool/Makefile Sun Jan 28 22:36:49 2001
@@ -9,8 +9,8 @@
csv.o html.o raw.o logtool.o main.o
SRC = logtool.c
@ -16,7 +16,7 @@
# For RedHat (and most other) Linux'es, this should be ideal
-CFLAGS= -Wall -O3 -ansi -pedantic -Werror # -DDEBUG -g # uncomment this for debugging stuff's
+CFLAGS= -I/usr/local/include -Wall -O3 -ansi -pedantic -Werror # -DDEBUG -g # uncomment this for debugging stuff's
+CFLAGS+= -I/usr/local/include -Wall -ansi -pedantic -Werror # -DDEBUG -g # uncomment this for debugging stuff's
+LIBS= -L/usr/local/lib -lgnugetopt
# For portability to non-linux'es/non-standard-linux'es, try this

View file

@ -1,10 +1,12 @@
--- logtail/Makefile.orig Sat Dec 30 20:17:09 2000
+++ logtail/Makefile Sat Dec 30 20:17:35 2000
@@ -2,7 +2,7 @@
--- logtail/Makefile.orig Mon Dec 25 19:24:25 2000
+++ logtail/Makefile Sun Jan 28 22:40:44 2001
@@ -1,8 +1,8 @@
SRC= logtail.c
PROG= logtail
CC= gcc
CFLAGS= -Wall -Werror -O3 -ansi -pedantic
-CFLAGS= -Wall -Werror -O3 -ansi -pedantic
-PREFIX=/usr
+CFLAGS+= -Wall -Werror -ansi -pedantic
+PREFIX=%%PREFIX%%
default: