PERFORCE change 98122 for review
soc-andrew
soc-andrew at FreeBSD.org
Tue May 30 04:31:50 PDT 2006
http://perforce.freebsd.org/chv.cgi?CH=98122
Change 98122 by soc-andrew at soc-andrew_serv on 2006/05/30 11:29:40
Fix a problem where DESTDIR was added to a directory twice
Split a long line to be under 80 chars
Affected files ...
.. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/Makefile.inc1#3 edit
.. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/po/Makefile#2 edit
Differences ...
==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/Makefile.inc1#3 (text+ko) ====
@@ -1,3 +1,3 @@
BSD_INSTALLER_LUA_DIR=${.CURDIR}/../../../contrib/bsdinstaller/backend/lua
-INST_DIR=${DESTDIR}/usr/libexec/bsdinstaller
+INST_DIR=/usr/libexec/bsdinstaller
==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/po/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
LANGUAGES= en
-LOCALEDIR= ${INST_DIR}/locale
+LOCALEDIR= ${DESTDIR}/${INST_DIR}/locale
all:
@true
@@ -8,7 +8,8 @@
# This is not a problem for the release scripts as they can install gettext
all-nls:
for _language in ${LANGUAGES}; do \
- msgfmt -o ${.OBJDIR}/$${_language}.mo ${.CURDIR}/$${_language}.po; \
+ msgfmt -o ${.OBJDIR}/$${_language}.mo \
+ ${.CURDIR}/$${_language}.po; \
done
clean-nls:
More information about the p4-projects
mailing list