diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2005-12-26 02:49:03 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2005-12-26 02:49:03 +0000 |
| commit | 2b62f499f494e89102261da4c56c28799b2dee60 (patch) | |
| tree | 037333371ec8837f9183acfee319a20e3d8417b8 /emulators | |
| parent | 316684f31e9294026d138cc5854bdc54e5a1d416 (diff) | |
| download | ports-2b62f499f494e89102261da4c56c28799b2dee60.tar.gz ports-2b62f499f494e89102261da4c56c28799b2dee60.zip | |
- A better way to trick rpm to create etc/nsswitch.conf.dist
PR: ports/90220
Submitted by: SANETO Takanori <sanewo@ba2.so-net.ne.jp>
Notes
Notes:
svn path=/head/; revision=152068
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/linux_base-8/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/emulators/linux_base-8/Makefile b/emulators/linux_base-8/Makefile index 9116f5e78be2..48f65ad510a1 100644 --- a/emulators/linux_base-8/Makefile +++ b/emulators/linux_base-8/Makefile @@ -129,8 +129,8 @@ ARCH= i386 LINUX_ELF= 3 PREVIOUS_ELF!= /sbin/sysctl -n ${FALLBACK_ELF_MIB} -# FIXME. This will result in a file at /compat/linux/etcnsswitch.conf.dist (sic!) -RPMFLAGS+= --relocate /etc/nsswitch.conf=/etc/nsswitch.conf.dist --badreloc +# FIXME. The double-// can go away, once we deprecate rpm-3 +RPMFLAGS+= --relocate /etc/nsswitch.conf=/etc//nsswitch.conf.dist --badreloc do-install: # @@ -149,7 +149,6 @@ do-install: ${ECHO} $$R; \ ${RPM} -U ${RPMFLAGS} ${RPMDIR}/$$R; \ done - @${MV} ${PREFIX}/etcnsswitch.conf.dist ${PREFIX}/etc/nsswitch.conf.dist @test -f ${PREFIX}/etc/nsswitch.conf || cp ${PREFIX}/etc/nsswitch.conf.dist \ ${PREFIX}/etc/nsswitch.conf @${FIND} ${PREFIX}/bin ${PREFIX}/sbin/ ${PREFIX}/usr/bin \ |