diff options
author | Martin Blapp <mbr@FreeBSD.org> | 2002-05-19 20:24:05 +0000 |
---|---|---|
committer | Martin Blapp <mbr@FreeBSD.org> | 2002-05-19 20:24:05 +0000 |
commit | fcaa518c5db8b124e3ea4b467de045b68d48f964 (patch) | |
tree | 3be0029b7504df523edacefce793b9555f9030ae | |
parent | Back to betas...Update to GNOME 2.0 beta 5. (diff) |
Change SO version in oo_setup.resp. Call sed directly.
Notes
Notes:
svn path=/head/; revision=59483
-rw-r--r-- | editors/openoffice-1.0/Makefile | 5 | ||||
-rw-r--r-- | editors/openoffice-1.0/files/oo_setup.resp | 2 | ||||
-rw-r--r-- | editors/openoffice.org-1.0/Makefile | 5 | ||||
-rw-r--r-- | editors/openoffice.org-1.0/files/oo_setup.resp | 2 | ||||
-rw-r--r-- | editors/openoffice/Makefile | 5 | ||||
-rw-r--r-- | editors/openoffice/files/oo_setup.resp | 2 |
6 files changed, 9 insertions, 12 deletions
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index 11158a972fda..4a492937eab7 100644 --- a/editors/openoffice-1.0/Makefile +++ b/editors/openoffice-1.0/Makefile @@ -139,9 +139,8 @@ do-build: tcsh -c 'source FreeBSDEnv.Set && dmake' pre-install: - ${SH} -c "cd ${WRKSRC}/../instsetoo/*.pro/01/normal && \ - ${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \ - < ${FILESDIR}/oo_setup.resp > oo_setup.resp" + @${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \ + > ${WRKSRC}/../instsetoo/unxfbsd.pro/01/normal/oo_setup.resp do-install: @-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \ diff --git a/editors/openoffice-1.0/files/oo_setup.resp b/editors/openoffice-1.0/files/oo_setup.resp index 83b51d7f0253..364169bdd695 100644 --- a/editors/openoffice-1.0/files/oo_setup.resp +++ b/editors/openoffice-1.0/files/oo_setup.resp @@ -1,7 +1,7 @@ [Environment] InstallationMode = INSTALL_NETWORK InstallationType = STANDARD -DestinationPath = @@PREFIX@@/OpenOffice.org641 +DestinationPath = %%PREFIX%%/OpenOffice.org1.0 [Java] JavaSupport = preinstalled_or_none diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile index 11158a972fda..4a492937eab7 100644 --- a/editors/openoffice.org-1.0/Makefile +++ b/editors/openoffice.org-1.0/Makefile @@ -139,9 +139,8 @@ do-build: tcsh -c 'source FreeBSDEnv.Set && dmake' pre-install: - ${SH} -c "cd ${WRKSRC}/../instsetoo/*.pro/01/normal && \ - ${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \ - < ${FILESDIR}/oo_setup.resp > oo_setup.resp" + @${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \ + > ${WRKSRC}/../instsetoo/unxfbsd.pro/01/normal/oo_setup.resp do-install: @-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \ diff --git a/editors/openoffice.org-1.0/files/oo_setup.resp b/editors/openoffice.org-1.0/files/oo_setup.resp index 83b51d7f0253..364169bdd695 100644 --- a/editors/openoffice.org-1.0/files/oo_setup.resp +++ b/editors/openoffice.org-1.0/files/oo_setup.resp @@ -1,7 +1,7 @@ [Environment] InstallationMode = INSTALL_NETWORK InstallationType = STANDARD -DestinationPath = @@PREFIX@@/OpenOffice.org641 +DestinationPath = %%PREFIX%%/OpenOffice.org1.0 [Java] JavaSupport = preinstalled_or_none diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile index 11158a972fda..4a492937eab7 100644 --- a/editors/openoffice/Makefile +++ b/editors/openoffice/Makefile @@ -139,9 +139,8 @@ do-build: tcsh -c 'source FreeBSDEnv.Set && dmake' pre-install: - ${SH} -c "cd ${WRKSRC}/../instsetoo/*.pro/01/normal && \ - ${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \ - < ${FILESDIR}/oo_setup.resp > oo_setup.resp" + @${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \ + > ${WRKSRC}/../instsetoo/unxfbsd.pro/01/normal/oo_setup.resp do-install: @-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \ diff --git a/editors/openoffice/files/oo_setup.resp b/editors/openoffice/files/oo_setup.resp index 83b51d7f0253..364169bdd695 100644 --- a/editors/openoffice/files/oo_setup.resp +++ b/editors/openoffice/files/oo_setup.resp @@ -1,7 +1,7 @@ [Environment] InstallationMode = INSTALL_NETWORK InstallationType = STANDARD -DestinationPath = @@PREFIX@@/OpenOffice.org641 +DestinationPath = %%PREFIX%%/OpenOffice.org1.0 [Java] JavaSupport = preinstalled_or_none |