Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 12 Jan 2005 14:34:40 +0800
From:      "Clarence Chu" <clcchu@hotmail.com>
To:        freebsd-openoffice@FreeBSD.Org
Subject:   openoffice-1.1/Makefile Changes
Message-ID:  <BAY16-F40FE936DF0CEF45C76947BDD890@phx.gbl>
next in thread | raw e-mail | index | archive | help 
hi there,

would you consider the following changes to openoffice-1.1/Makefile be
a more reasonable one?

--- Makefile.orig   Wed Jan 12 13:25:48 2005
+++ Makefile    Wed Jan 12 14:29:20 2005
@@ -80,7 +80,7 @@
CODELINE=      645
RELEASE_NR=        ${PORTVERSION}
INSTALLATION_BASEDIR=  OpenOffice.org${RELEASE_NR}
-EXECBASE=      openoffice.org-${RELEASE_NR}
+EXECBASE=      openoffice-${RELEASE_NR}
DIST_SUBDIR=       openoffice1.1
SIMPLEOSVER!=      ${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//'
PACKAGE_BASENAME=       OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel
@@ -223,20 +223,21 @@
            ${WRKDIR}/openoffice-wrapper
    @${INSTALL_SCRIPT} ${WRKDIR}/openoffice-wrapper \
        ${PREFIX}/bin/${EXECBASE}
-   @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sagenda
-   @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-scalc
-   @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sdraw
-   @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-setup
-   @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sfax
-   @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-smath
-   @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-simpress
-   @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-spadmin
-   @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-sweb
-   @${LN} -fs ${PREFIX}/bin/${EXECBASE} ${PREFIX}/bin/${EXECBASE}-swriter
+   @cd ${PREFIX}/bin ; ${LN} -fs ${EXECBASE} ${EXECBASE}-sagenda
+   @cd ${PREFIX}/bin ; ${LN} -fs ${EXECBASE} ${EXECBASE}-scalc
+   @cd ${PREFIX}/bin ; ${LN} -fs ${EXECBASE} ${EXECBASE}-sdraw
+   @cd ${PREFIX}/bin ; ${LN} -fs ${EXECBASE} ${EXECBASE}-setup
+   @cd ${PREFIX}/bin ; ${LN} -fs ${EXECBASE} ${EXECBASE}-sfax
+   @cd ${PREFIX}/bin ; ${LN} -fs ${EXECBASE} ${EXECBASE}-smath
+   @cd ${PREFIX}/bin ; ${LN} -fs ${EXECBASE} ${EXECBASE}-simpress
+   @cd ${PREFIX}/bin ; ${LN} -fs ${EXECBASE} ${EXECBASE}-spadmin
+   @cd ${PREFIX}/bin ; ${LN} -fs ${EXECBASE} ${EXECBASE}-sweb
+   @cd ${PREFIX}/bin ; ${LN} -fs ${EXECBASE} ${EXECBASE}-swriter
    @cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} > 
${TMPPLIST
}
    @cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> 
${TMPPLIS
T}
    @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> 
${TMPPLIST}
    @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type l >> 
${TMPPLIST}
+   @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d  -empty | 
${XA
RGS} ${RMDIR}
    @cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type d > 
${WRKDIR}/di
r.tmp
    @${SORT} -r ${WRKDIR}/dir.tmp | ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> 
${TMP
PLIST}
    @${CP} ${FILESDIR}/pkg-message.in ${PKGMESSAGE}

_________________________________________________________________
No masks required! Use MSN Messenger to chat with friends and family. 
http://go.msnserver.com/HK/25382.asp

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?BAY16-F40FE936DF0CEF45C76947BDD890>