NetBSD doesn't include /lib in its link path, so we need to add it as an RPATH.
This commit is contained in:
		
							
								
								
									
										2
									
								
								etc.BSD/.gitignore
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								etc.BSD/.gitignore
									
									
									
									
										vendored
									
									
										Normal file
									
								
							@@ -0,0 +1,2 @@
 | 
				
			|||||||
 | 
					rc
 | 
				
			||||||
 | 
					rc.shutdown
 | 
				
			||||||
							
								
								
									
										13
									
								
								mk/prog.mk
									
									
									
									
									
								
							
							
						
						
									
										13
									
								
								mk/prog.mk
									
									
									
									
									
								
							@@ -5,13 +5,22 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
OBJS+=			${SRCS:.c=.o}
 | 
					OBJS+=			${SRCS:.c=.o}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					include ${MK}/sys.mk
 | 
				
			||||||
 | 
					# Some systems don't include /lib in their standard link path
 | 
				
			||||||
 | 
					# so we should embed it if different
 | 
				
			||||||
 | 
					_RPATH_SH=		if test "${SHLIBDIR}" != "/usr/${LIBNAME}"; then \
 | 
				
			||||||
 | 
									echo "-Wl,-rpath-link,${DESTDIR}${SHLIBDIR}:${DESTDIR}/usr/lib -R${SHLIBDIR}"; \
 | 
				
			||||||
 | 
								fi
 | 
				
			||||||
 | 
					_RPATH!=		${_RPATH_SH}
 | 
				
			||||||
 | 
					LDFLAGS+=		${_RPATH}$(shell ${_RPATH_SH})
 | 
				
			||||||
 | 
					LDFLAGS+=		${PROGLDFLAGS}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
all: depend ${PROG}
 | 
					all: depend ${PROG}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
${PROG}: ${SCRIPTS} ${OBJS}
 | 
					${PROG}: ${SCRIPTS} ${OBJS}
 | 
				
			||||||
	${CC} ${CFLAGS} ${LDFLAGS} ${PROGLDFLAGS} -o $@ ${OBJS} ${LDADD}
 | 
						${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${OBJS} ${LDADD}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
clean:
 | 
					clean:
 | 
				
			||||||
	rm -f ${OBJS} ${PROG} ${CLEANFILES}
 | 
						rm -f ${OBJS} ${PROG} ${CLEANFILES}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
include ${MK}/sys.mk
 | 
					 | 
				
			||||||
include ${MK}/depend.mk
 | 
					include ${MK}/depend.mk
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -29,5 +29,9 @@ realinstall: ${BIN} ${CONF} ${CONF_APPEND}
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
install: realinstall ${INSTALLAFTER}
 | 
					install: realinstall ${INSTALLAFTER}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# A lot of scripts don't have anything to clean
 | 
				
			||||||
 | 
					# Also, some rm implentation require a file argument regardless of error
 | 
				
			||||||
 | 
					# so we ensure that it has a bogus argument
 | 
				
			||||||
 | 
					CLEANFILES?=	.bogus
 | 
				
			||||||
clean:
 | 
					clean:
 | 
				
			||||||
	rm -f ${OBJS} ${CLEANFILES}
 | 
						rm -f ${OBJS} ${CLEANFILES}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user