[Midnightbsd-cvs] mports: bsd.mport.mk: Operation hack job.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Apr 30 15:59:01 EDT 2008


Log Message:
-----------
Operation hack job.

When we went to fake, we lost the install-desktop-entries target.  A few Java ports use this to generate .desktop files so freedesktop friendly environments know about the apps.  This also makes the ${PREFIX}/share/applications directory automagically.

Modified Files:
--------------
    mports/Mk:
        bsd.mport.mk (r1.97 -> r1.98)

-------------- next part --------------
Index: bsd.mport.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.mport.mk,v
retrieving revision 1.97
retrieving revision 1.98
diff -L Mk/bsd.mport.mk -L Mk/bsd.mport.mk -u -r1.97 -r1.98
--- Mk/bsd.mport.mk
+++ Mk/bsd.mport.mk
@@ -3572,7 +3572,6 @@
 .	endif
 .endif
 
-
 .if !target(fake-post-install)
 fake-post-install:
 .	if target(post-install)
@@ -3956,7 +3955,7 @@
 
 _FAKE_DEP=		build
 _FAKE_SEQ=		fake-message fake-dir apply-slist pre-fake fake-pre-install \
-				generate-plist fake-pre-su-install do-fake fake-post-install \
+				generate-plist fake-pre-su-install do-fake install-desktop-entries fake-post-install \
 				post-fake compress-man install-rc-script install-ldconfig-file \
 				fix-fake-symlinks finish-tmpplist
 
@@ -5817,15 +5816,15 @@
 .if !target(install-desktop-entries)
 install-desktop-entries:
 .if defined(DESKTOP_ENTRIES)
-	@(${MKDIR} "${DESKTOPDIR}" 2> /dev/null) || \
-		(${ECHO_MSG} "===> Cannot create ${DESKTOPDIR}, check permissions"; exit 1)
+	@(${MKDIR} "${FAKE_DESTDIR}${DESKTOPDIR}" 2> /dev/null) || \
+		(${ECHO_MSG} "===> Cannot create ${FAKE_DESTDIR}${DESKTOPDIR}, check permissions"; exit 1)
 	@set -- ${DESKTOP_ENTRIES} XXX; \
 	if [ -z "${_DESKTOPDIR_REL}" ]; then \
 		${ECHO_CMD} "@cwd ${DESKTOPDIR}" >> ${TMPPLIST}; \
 	fi; \
 	while [ $$# -gt 6 ]; do \
 		filename="$$4.desktop"; \
-		pathname="${DESKTOPDIR}/$$filename"; \
+		pathname="${FAKE_DESTDIR}${DESKTOPDIR}/$$filename"; \
 		categories="$$5"; \
 		if [ -z "$$categories" ]; then \
 			categories="`cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} desktop-categories`"; \


More information about the Midnightbsd-cvs mailing list