diff options
| author | Akinori MUSHA <knu@FreeBSD.org> | 2002-07-24 09:26:24 +0000 |
|---|---|---|
| committer | Akinori MUSHA <knu@FreeBSD.org> | 2002-07-24 09:26:24 +0000 |
| commit | 0331ef246447f19e502c01f80c956e821f35e7e5 (patch) | |
| tree | 4fdc01e6e90105768958e67a82711b1e3a15223d /japanese/libjconv/files | |
| parent | Update to 0.8.2. (diff) | |
Honor PREFIX and LOCALBASE properly.
Pointed out by: "Simon 'corecode' Schubert" <corecode@corecode.ath.cx>
Notes
Notes:
svn path=/head/; revision=63474
Diffstat (limited to 'japanese/libjconv/files')
| -rw-r--r-- | japanese/libjconv/files/Makefile | 17 | ||||
| -rw-r--r-- | japanese/libjconv/files/Makefile.lib | 11 | ||||
| -rw-r--r-- | japanese/libjconv/files/Makefile.prog | 3 | ||||
| -rw-r--r-- | japanese/libjconv/files/patch-info.c | 2 |
4 files changed, 21 insertions, 12 deletions
diff --git a/japanese/libjconv/files/Makefile b/japanese/libjconv/files/Makefile index 388949b9624d..f89294c3087c 100644 --- a/japanese/libjconv/files/Makefile +++ b/japanese/libjconv/files/Makefile @@ -1,13 +1,18 @@ # $FreeBSD$ +PREFIX?= /usr/local +LOCALBASE?= /usr/local + +MAKE_ARGS= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} + all: - ${MAKE} LOCALBASE=${LOCALBASE} -f Makefile.lib - ${MAKE} LOCALBASE=${LOCALBASE} -f Makefile.prog + ${MAKE} ${MAKE_ARGS} -f Makefile.lib + ${MAKE} ${MAKE_ARGS} -f Makefile.prog install: - ${MAKE} LOCALBASE=${LOCALBASE} -f Makefile.lib install - ${MAKE} LOCALBASE=${LOCALBASE} -f Makefile.prog install + ${MAKE} ${MAKE_ARGS} -f Makefile.lib install + ${MAKE} ${MAKE_ARGS} -f Makefile.prog install clean: - ${MAKE} LOCALBASE=${LOCALBASE} -f Makefile.lib clean - ${MAKE} LOCALBASE=${LOCALBASE} -f Makefile.prog clean + ${MAKE} ${MAKE_ARGS} -f Makefile.lib clean + ${MAKE} ${MAKE_ARGS} -f Makefile.prog clean diff --git a/japanese/libjconv/files/Makefile.lib b/japanese/libjconv/files/Makefile.lib index 7879f5467e30..709ed05f1787 100644 --- a/japanese/libjconv/files/Makefile.lib +++ b/japanese/libjconv/files/Makefile.lib @@ -1,17 +1,20 @@ # $FreeBSD$ +PREFIX?= /usr/local +LOCALBASE?= /usr/local + LIB= jconv SHLIB_MAJOR?= 0 SHLIB_MINOR?= 0 -CFLAGS+= -Wall -I${LOCALBASE}/include -DLOCALBASE=${LOCALBASE} +CFLAGS+= -Wall -I${LOCALBASE}/include -DPREFIX=${PREFIX} LDADD= -liconv -L${LOCALBASE}/lib SRCS= conv.c info.c compat.c INCS= jconv.h NOMAN= YES -LIBDIR= ${LOCALBASE}/lib -INCSDIR= ${LOCALBASE}/include +LIBDIR= ${PREFIX}/lib +INCSDIR= ${PREFIX}/include INCDIR= ${INCSDIR} # for pre-bsd.incs.mk API -ETCDIR= ${LOCALBASE}/etc +ETCDIR= ${PREFIX}/etc .include <bsd.lib.mk> diff --git a/japanese/libjconv/files/Makefile.prog b/japanese/libjconv/files/Makefile.prog index 023771d670b8..9b5140d4de2b 100644 --- a/japanese/libjconv/files/Makefile.prog +++ b/japanese/libjconv/files/Makefile.prog @@ -1,5 +1,6 @@ # $FreeBSD$ +PREFIX?= /usr/local LOCALBASE?= /usr/local PROG= jconv @@ -7,6 +8,6 @@ SRCS= jconv.c CFLAGS+= -I${LOCALBASE}/include LDADD= -L${.CURDIR} -ljconv NOMAN= YES -BINDIR= ${LOCALBASE}/bin +BINDIR= ${PREFIX}/bin .include <bsd.prog.mk> diff --git a/japanese/libjconv/files/patch-info.c b/japanese/libjconv/files/patch-info.c index f4a6c2c829d3..a92cbc1f8afc 100644 --- a/japanese/libjconv/files/patch-info.c +++ b/japanese/libjconv/files/patch-info.c @@ -5,7 +5,7 @@ #define DEBUG_DO(x) -#define JCONV_DEFAULT_CONFFILE "/etc/libjconv/default.conf" -+#define JCONV_DEFAULT_CONFFILE "!!LOCALBASE!!/etc/libjconv/default.conf" ++#define JCONV_DEFAULT_CONFFILE "!!PREFIX!!/etc/libjconv/default.conf" typedef struct { char *name; |