1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-04 01:48:54 +00:00

clean up do-install and install-user section

(do-install section was wrong. alinged to tab...)
This commit is contained in:
Maho Nakata 2004-03-13 02:33:31 +00:00
parent 20bf2d1bc8
commit b331e700df
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=103829
4 changed files with 20 additions and 32 deletions

View File

@ -473,20 +473,17 @@ do-install:
# #
${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
@sleep 5 @sleep 5
@cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \
@SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \ SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX}
./install --prefix=${PREFIX}
@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
@${RM} -f ${WRKDIR}/.Xvfb.pid @${RM} -f ${WRKDIR}/.Xvfb.pid
.else .else
@cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \
@SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \ SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX}
./install --prefix=${PREFIX}
.endif .endif
install-user: install-user:
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \ @SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
post-install: post-install:
@${ECHO_MSG} "===> Add wrapper scripts"; @${ECHO_MSG} "===> Add wrapper scripts";

View File

@ -473,20 +473,17 @@ do-install:
# #
${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
@sleep 5 @sleep 5
@cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \
@SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \ SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX}
./install --prefix=${PREFIX}
@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
@${RM} -f ${WRKDIR}/.Xvfb.pid @${RM} -f ${WRKDIR}/.Xvfb.pid
.else .else
@cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \
@SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \ SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX}
./install --prefix=${PREFIX}
.endif .endif
install-user: install-user:
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \ @SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
post-install: post-install:
@${ECHO_MSG} "===> Add wrapper scripts"; @${ECHO_MSG} "===> Add wrapper scripts";

View File

@ -473,20 +473,17 @@ do-install:
# #
${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
@sleep 5 @sleep 5
@cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \
@SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \ SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX}
./install --prefix=${PREFIX}
@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
@${RM} -f ${WRKDIR}/.Xvfb.pid @${RM} -f ${WRKDIR}/.Xvfb.pid
.else .else
@cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \
@SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \ SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX}
./install --prefix=${PREFIX}
.endif .endif
install-user: install-user:
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \ @SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
post-install: post-install:
@${ECHO_MSG} "===> Add wrapper scripts"; @${ECHO_MSG} "===> Add wrapper scripts";

View File

@ -473,20 +473,17 @@ do-install:
# #
${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
@sleep 5 @sleep 5
@cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \
@SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \ SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX}
./install --prefix=${PREFIX}
@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
@${RM} -f ${WRKDIR}/.Xvfb.pid @${RM} -f ${WRKDIR}/.Xvfb.pid
.else .else
@cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \ @cd ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/ ; \
@SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} \ SAL_IGNOREXERRORS=1 TEMP=${WRKDIR} DISPLAY=${DISPLAY} ./install --prefix=${PREFIX}
./install --prefix=${PREFIX}
.endif .endif
install-user: install-user:
@-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" \ @SAL_IGNOREXERRORS=1 ${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
${PREFIX}/${INSTALLATION_BASEDIR}/program/setup
post-install: post-install:
@${ECHO_MSG} "===> Add wrapper scripts"; @${ECHO_MSG} "===> Add wrapper scripts";