Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › fd092c7
Clean up the makefiles a bit and make them OBJDIR-safe.
Dag-Erling Smørgrav committed 12 years ago
commit fd092c7187bedc4e707635ec0b8f483884c0c7bf
parent 203e46a
7 files changed +28 -38
modified Makefile
@@ -4,7 +4,7 @@ SUBDIR= external \
	pkg \

	scripts
- 
NEWVERS=	newvers.sh
+ 
NEWVERS=	${.CURDIR}/newvers.sh



.if !defined(NOSTATIC)

SUBDIR+=	pkg-static
@@ -78,6 +78,6 @@ make-tarball:
	    -o ${TARBALL_FILE} ${PKGVERSION}



Doxyfile: Doxyfile.in ${NEWVERS} ${_snapshot}
- 
	sed -e 's,%%PKGVERSION%%,${PKGVERSION},' ${.TARGET:S,$,.in,} > ${.TARGET}
+ 
	sed -e 's,%%PKGVERSION%%,${PKGVERSION},' ${.CURDIR}/${.TARGET:S,$,.in,} > ${.TARGET}



.include <bsd.subdir.mk>
modified libpkg/Makefile
@@ -51,7 +51,7 @@ MAN= pkg_printf.3 \


CLEANFILES=	${PC} ${PKGH}
- 
NEWVERS=	../newvers.sh
+ 
NEWVERS=	${.CURDIR}/../newvers.sh



PKGVERSION!=	sh ${NEWVERS} pkg

PORTVERSION!=	sh ${NEWVERS} port
@@ -65,7 +65,7 @@ ${_snapshot}:
all: ${PC}



realinstall: ${PC}
- 
	${INSTALL} -m 644 ${.OBJDIR}/${PC} ${DESTDIR}${PREFIX}/libdata/pkgconfig
+ 
	${INSTALL} -m 644 ${PC} ${DESTDIR}${PREFIX}/libdata/pkgconfig



#

# Set DEFAULT_MIRROR_TYPE default to SRV
@@ -78,13 +78,14 @@ DEFAULT_MIRROR_TYPE?= 1


CFLAGS+=	-DDEFAULT_MIRROR_TYPE=${DEFAULT_MIRROR_TYPE}

CFLAGS+=	-std=c99
- 
CFLAGS+=	-I${.CURDIR} \
+ 
CFLAGS+=	-I. \
+ 
		-I${.CURDIR} \

		-I${.CURDIR}/../external/sqlite \

		-I${.CURDIR}/../external/uthash



.if !exists(/usr/include/bsdyml.h)

CFLAGS+=	-DBUNDLED_YAML -I ${.CURDIR}/../external/libyaml/include
- 
LDADD+=		-L${.OBJDIR}/../external/libyaml -lyaml
+ 
LDADD+=		-L../external/libyaml -lyaml

.else

LDADD+=		-lbsdyml

.endif
@@ -94,11 +95,11 @@ CFLAGS+= -I${.CURDIR}/../external/libelf \
		-DBUNDLED_LIBELF

.endif
- 
LDADD+=		-L${.OBJDIR}/../external/sqlite \
- 
		-L${.OBJDIR}/../external/libyaml
+ 
LDADD+=		-L../external/sqlite \
+ 
		-L../external/libyaml



.if defined(WITH_BUNDLED_LIBELF)
- 
LDADD+=		-L${.OBJDIR}/../external/libelf
+ 
LDADD+=		-L../external/libelf

.endif



LDADD+=		-lsqlite3 \
modified pkg-static/Makefile
@@ -4,17 +4,17 @@ STATIC_PKGNG= yes
NO_SHARED?=	yes

NO_MAN=		yes

NOMAN=		yes
- 
LDADD_STATIC=	-L${.OBJDIR}/../external/sqlite
+ 
LDADD_STATIC=	-L../external/sqlite



.if !exists(/usr/include/bsdyml.h)
- 
LDADD_STATIC+=	-L${.OBJDIR}/../external/libyaml \
+ 
LDADD_STATIC+=	-L../external/libyaml \

		-lyaml

.else

LDADD_STATIC+=	-lbsdyml

.endif



.if defined(WITH_BUNDLED_LIBELF)
- 
LDADD_STATIC+=	-L${.OBJDIR}/../external/libelf
+ 
LDADD_STATIC+=	-L../external/libelf

.endif



LDADD_STATIC+=	-lsqlite3 \
modified pkg/Makefile
@@ -55,9 +55,9 @@ DEBUG_FLAGS+= -ggdb -O0
DEBUG_FLAGS+=	-pg

.endif
- 
CFLAGS+=	-I${.CURDIR}/../libpkg \
- 
			-I${.CURDIR}/../external/uthash
- 
LDADD+=		-L${.OBJDIR}/../libpkg \
+ 
CFLAGS+=	-I../libpkg \
+ 
		-I${.CURDIR}/../external/uthash
+ 
LDADD+=		-L../libpkg \

		-lpkg \

		-larchive \

		-lutil \
modified scripts/completion/Makefile
@@ -5,6 +5,7 @@ PREFIX?= /usr/local
COMPLETION_SRCS=	_pkg.bash.in \

			_pkg.zsh.in

COMPLETION=	${COMPLETION_SRCS:R}
+ 
CLEANFILES=	${COMPLETION}



.in:

	sed -e 's,__PREFIX__,${PREFIX},g' \
@@ -12,13 +13,10 @@ COMPLETION= ${COMPLETION_SRCS:R}


all: ${COMPLETION}
- 
clean:
- 
	rm -f ${.OBJDIR}/${COMPLETION}
- 


install: all

	install -d ${DESTDIR}${PREFIX}/share/zsh/site-functions/

	install -d ${DESTDIR}${PREFIX}/etc/bash_completion.d/
- 
	install -m 444 ${.OBJDIR}/_pkg.bash ${DESTDIR}${PREFIX}/etc/bash_completion.d/
- 
	install -m 444 ${.OBJDIR}/_pkg.zsh ${DESTDIR}${PREFIX}/share/zsh/site-functions/_pkg
+ 
	install -m 444 _pkg.bash ${DESTDIR}${PREFIX}/etc/bash_completion.d/
+ 
	install -m 444 _pkg.zsh ${DESTDIR}${PREFIX}/share/zsh/site-functions/_pkg
- 
.include <bsd.own.mk>
+ 
.include <bsd.prog.mk>
modified scripts/periodic/Makefile
@@ -8,6 +8,7 @@ SCRIPTS_DAILY= 400.status-pkg.in \
SCRIPTS_SECURITY=	410.pkg-audit.in \

			460.pkg-checksum.in

SCRIPTS=	${SCRIPTS_DAILY:R} ${SCRIPTS_SECURITY:R}
+ 
CLEANFILES=	${SCRIPTS}



.in:

	sed -e 's,__PREFIX__,${PREFIX},g' \
@@ -15,17 +16,14 @@ SCRIPTS= ${SCRIPTS_DAILY:R} ${SCRIPTS_SECURITY:R}


all: ${SCRIPTS}
- 
clean:
- 
	rm -f ${.OBJDIR}/${SCRIPTS}
- 


install: all

	install -d ${DESTDIR}${PREFIX}/etc/periodic/security

	install -d ${DESTDIR}${PREFIX}/etc/periodic/daily

.for periodic in ${SCRIPTS_DAILY:R}
- 
	install -m 555 ${.OBJDIR}/${periodic} ${DESTDIR}${PREFIX}/etc/periodic/daily
+ 
	install -m 555 ${periodic} ${DESTDIR}${PREFIX}/etc/periodic/daily

.endfor

.for periodic in ${SCRIPTS_SECURITY:R}
- 
	install -m 555 ${.OBJDIR}/${periodic} ${DESTDIR}${PREFIX}/etc/periodic/security
+ 
	install -m 555 ${periodic} ${DESTDIR}${PREFIX}/etc/periodic/security

.endfor
- 
.include <bsd.own.mk>
+ 
.include <bsd.prog.mk>
modified scripts/sbin/Makefile
@@ -2,19 +2,12 @@


PREFIX?=	/usr/local
- 
SRCS=	pkg2ng.in
- 
SCRIPTS=	${SRCS:R}
+ 
SCRIPTS=	pkg2ng
+ 
CLEANFILES=	${SCRIPTS}
+ 
BINDIR=		${PREFIX}/sbin



.in:

	sed -e 's,__PREFIX__,${PREFIX},g' \

		${.IMPSRC} > ${.TARGET}
- 
all: ${SCRIPTS}
-
- 
clean:
- 
	rm -f ${.OBJDIR}/${SCRIPTS}
-
- 
install: all
- 
	install -m 555 ${.OBJDIR}/pkg2ng ${DESTDIR}${PREFIX}/sbin/
-
- 
.include <bsd.own.mk>
+ 
.include <bsd.prog.mk>