pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Replaced direct invocation with SUBST_SED. Removed post-install section.
Module Name: pkgsrc-wip
Committed By: Santhosh Raju <fox%NetBSD.org@localhost>
Pushed By: fox
Date: Sat Apr 20 12:57:28 2019 -0500
Changeset: a308a4eeb376f8a8f7ea9240758842b2c23fc4dd
Modified Files:
coyim/Makefile
Log Message:
Replaced direct invocation with SUBST_SED. Removed post-install section.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a308a4eeb376f8a8f7ea9240758842b2c23fc4dd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
coyim/Makefile | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diffs:
diff --git a/coyim/Makefile b/coyim/Makefile
index 4c0edb8ec1..70df9c500c 100644
--- a/coyim/Makefile
+++ b/coyim/Makefile
@@ -26,24 +26,21 @@ CHECK_PORTABILITY_SKIP+= build/mac-bundle/coyim-launcher.sh
COYIM_ICON= coyim.png
COYIM_ICON_SRC= ${WRKSRC}/build/mac-bundle/coy.iconset/icon_32x32%2x.png@localhost
-COYIM_DESKTOP_SAMPLE= ${WRKSRC}/build/coyim.desktop.sample
COYIM_DESKTOP= ${WRKSRC}/build/coyim.desktop
INSTALLATION_DIRS+= share/applications share/pixmaps
-post-build:
- ${CP} ${COYIM_DESKTOP} ${COYIM_DESKTOP_SAMPLE}
- ${SED} -e '/^#/d' \
- -e '/^$$/d' \
- < ${COYIM_DESKTOP_SAMPLE} \
- > ${COYIM_DESKTOP}
- ${ECHO} "Exec=${PREFIX}/bin/coyim" >> ${COYIM_DESKTOP}
- ${ECHO} "Icon=${COYIM_ICON}" >> ${COYIM_DESKTOP}
+SUBST_CLASSES+= desktop-entry
+SUBST_STAGE.desktop-entry= post-build
+SUBST_MESSAGE.desktop-entry= Create desktop entry.
+SUBST_FILES.desktop-entry= ${COYIM_DESKTOP}
+SUBST_SED.desktop-entry= -e 's|\# Exec=/path/to/coyim/executable|Exec=${PREFIX}/bin/coyim|'
+SUBST_SED.desktop-entry+= -e 's|\# Icon=/path/to/Coy.icns|Icon=${COYIM_ICON}|'
+SUBST_SED.desktop-entry+= -e '/^\#/d'
+SUBST_SED.desktop-entry+= -e '/^$$/d'
do-install:
${INSTALL_PROGRAM} ${WRKDIR}/bin/coyim ${DESTDIR}${PREFIX}/bin
-
-post-install:
${INSTALL_DATA} ${COYIM_DESKTOP} ${DESTDIR}${PREFIX}/share/applications/
${INSTALL_DATA} ${COYIM_ICON_SRC} ${DESTDIR}${PREFIX}/share/pixmaps/${COYIM_ICON}
Home |
Main Index |
Thread Index |
Old Index