resolve collision (firefox.desktop)

This commit is contained in:
martynas 2009-06-21 20:46:38 +00:00
parent 2b3482f53c
commit ca87e3e281
2 changed files with 6 additions and 5 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2009/06/21 20:41:40 martynas Exp $ # $OpenBSD: Makefile,v 1.9 2009/06/21 20:46:38 martynas Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64 ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64
@ -145,11 +145,12 @@ do-install:
${MOB}/LICENSE ${MOB}/application.ini ${MOB}/blocklist.xml \ ${MOB}/LICENSE ${MOB}/application.ini ${MOB}/blocklist.xml \
${MOB}/platform.ini ${MOZ} ${MOB}/platform.ini ${MOZ}
${INSTALL_DATA_DIR} ${PREFIX}/share/applications ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
${INSTALL_DATA} ${FILESDIR}/firefox.desktop ${PREFIX}/share/applications ${INSTALL_DATA} ${FILESDIR}/firefox.desktop \
${PREFIX}/share/applications/firefox35.desktop
perl -pi -e 's,!!PREFIX!!,${TRUEPREFIX},g; \ perl -pi -e 's,!!PREFIX!!,${TRUEPREFIX},g; \
s,!!LOCALBASE!!,${LOCALBASE},g; s,!!VERSION!!,${VER},g' \ s,!!LOCALBASE!!,${LOCALBASE},g; s,!!VERSION!!,${VER},g' \
${MOZ}/README.OpenBSD \ ${MOZ}/README.OpenBSD \
${PREFIX}/share/applications/firefox.desktop ${PREFIX}/share/applications/firefox35.desktop
${INSTALL_SCRIPT} ${MOB}/firefox ${PREFIX}/bin/firefox35 ${INSTALL_SCRIPT} ${MOB}/firefox ${PREFIX}/bin/firefox35
${INSTALL_SCRIPT} ${MOB}/run-mozilla.sh ${MOZ} ${INSTALL_SCRIPT} ${MOB}/run-mozilla.sh ${MOZ}
${INSTALL_PROGRAM} ${MOB}/mozilla-xremote-client ${MOB}/regxpcom ${MOZ} ${INSTALL_PROGRAM} ${MOB}/mozilla-xremote-client ${MOB}/regxpcom ${MOZ}

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2009/06/21 20:41:40 martynas Exp $ @comment $OpenBSD: PLIST,v 1.6 2009/06/21 20:46:38 martynas Exp $
bin/firefox35 bin/firefox35
firefox35/ firefox35/
firefox35/LICENSE firefox35/LICENSE
@ -413,7 +413,7 @@ firefox35/searchplugins/eBay.xml
firefox35/searchplugins/google.xml firefox35/searchplugins/google.xml
firefox35/searchplugins/wikipedia.xml firefox35/searchplugins/wikipedia.xml
firefox35/searchplugins/yahoo.xml firefox35/searchplugins/yahoo.xml
share/applications/firefox.desktop share/applications/firefox35.desktop
@exec %D/bin/update-desktop-database @exec %D/bin/update-desktop-database
@unexec %D/bin/update-desktop-database @unexec %D/bin/update-desktop-database
@exec TEMP=`mktemp -d` && cd %D/firefox35 && env HOME=$TEMP LD_LIBRARY_PATH=%D/firefox35 ./regxpcom && rm -fr $TEMP @exec TEMP=`mktemp -d` && cd %D/firefox35 && env HOME=$TEMP LD_LIBRARY_PATH=%D/firefox35 ./regxpcom && rm -fr $TEMP