Fix installing into PREFIX.
This commit is contained in:
		
							
								
								
									
										4
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								Makefile
									
									
									
									
									
								
							| @@ -17,5 +17,5 @@ include ${MK}/subdir.mk | ||||
| include ${MK}/dist.mk | ||||
|  | ||||
| _installafter: | ||||
| 	${INSTALL} -d ${DESTDIR}${RC_LIB}/init.d | ||||
| 	${INSTALL} -d ${DESTDIR}${RC_LIB}/tmp | ||||
| 	${INSTALL} -d ${DESTDIR}/${PREFIX}/${RC_LIB}/init.d | ||||
| 	${INSTALL} -d ${DESTDIR}/${PREFIX}/${RC_LIB}/tmp | ||||
|   | ||||
							
								
								
									
										13
									
								
								mk/sys.mk
									
									
									
									
									
								
							
							
						
						
									
										13
									
								
								mk/sys.mk
									
									
									
									
									
								
							| @@ -7,7 +7,10 @@ INSTALL?=		install | ||||
| RANLIB?=		ranlib | ||||
| SH=			/bin/sh | ||||
|  | ||||
| PREFIX=			 | ||||
| PREFIX?=	 | ||||
| _UPREFIX_SH=		case "${PREFIX}" in "") echo /usr;; *) echo "${PREFIX}";; esac | ||||
| _UPREFIX!=		${_UPREFIX_SH} | ||||
| UPREFIX=		${_UPREFIX}$(shell ${_UPREFIX_SH}) | ||||
| PKG_PREFIX=		/usr/local | ||||
|  | ||||
| PICFLAG?=		-fPIC | ||||
| @@ -15,18 +18,18 @@ PICFLAG?=		-fPIC | ||||
| BINDIR?=		${PREFIX}/sbin | ||||
| BINMODE?=		0755 | ||||
|  | ||||
| INCDIR?=		${PREFIX}/usr/include | ||||
| INCDIR?=		${UPREFIX}/include | ||||
| INCMODE?=		0444 | ||||
|  | ||||
| LIBNAME?=		lib | ||||
| LIBDIR?=		${PREFIX}/usr/${LIBNAME} | ||||
| LIBDIR?=		${UPREFIX}/${LIBNAME} | ||||
| LIBMODE?=		0444 | ||||
| SHLIBDIR?=		${PREFIX}/${LIBNAME} | ||||
|  | ||||
| MANDIR?=		${PREFIX}/usr/share/man/man | ||||
| MANDIR?=		${UPREFIX}/share/man/man | ||||
| MANMODE?=		0444 | ||||
|  | ||||
| DOCDIR?=		${PREFIX}/usr/share/doc | ||||
| DOCDIR?=		${UPREFIX}/share/doc | ||||
| DOCMODE?=		0644	 | ||||
|  | ||||
| CONFMODE?=		0644 | ||||
|   | ||||
| @@ -2,7 +2,7 @@ BOOT=		bootmisc fsck hostname localmount \ | ||||
| 		root swap sysctl urandom | ||||
| DEFAULT=	local netmount | ||||
|  | ||||
| LEVELDIR=	${DESTDIR}/etc/runlevels | ||||
| LEVELDIR=	${DESTDIR}/${PREFIX}/etc/runlevels | ||||
| BOOTDIR=	${LEVELDIR}/boot | ||||
| DEFAULTDIR=	${LEVELDIR}/default | ||||
|  | ||||
|   | ||||
| @@ -11,7 +11,7 @@ include Makefile.${SUBOS} | ||||
| include ${MK}/scripts.mk | ||||
|  | ||||
| _installafter: | ||||
| 	${INSTALL} -d ${DESTDIR}/etc/init.d | ||||
| 	${INSTALL} -d ${DESTDIR}/${PREFIX}/etc/init.d | ||||
| 	@# Provide an init script for the loopback interface | ||||
| 	ln -snf ${RC_LIB}/sh/net.sh ${DESTDIR}/${PREFIX}/etc/init.d/${NET_LO} || exit $$? | ||||
| 	@# Put functions.sh into the init.d dir so 3rd party apps don't have to | ||||
|   | ||||
		Reference in New Issue
	
	Block a user