diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-01-19 22:50:09 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-01-19 22:50:09 +0000 |
| commit | 3b85e78755e0223254e72db7af815416900c7d2a (patch) | |
| tree | a76d4c843c9b9c1591b38a72828024a30b689476 /x11 | |
| parent | Fix a compilation problem on -CURRENT (again because /usr/include/malloc.h (diff) | |
Correct last commit. PKG_PREFIX is only set by pkg_add, thus when building the
port, the variable does not exist.
Spotted by: Mark Hannon <markhannon@optusnet.com.au>
Notes
Notes:
svn path=/head/; revision=73568
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gdm/Makefile | 6 | ||||
| -rw-r--r-- | x11/gdm/pkg-install | 6 | ||||
| -rw-r--r-- | x11/gdm2/Makefile | 6 | ||||
| -rw-r--r-- | x11/gdm2/pkg-install | 6 |
4 files changed, 20 insertions, 4 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index c5e9a26f38c7..9f18d67aa8fc 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -52,6 +52,12 @@ post-install: .if !defined(BATCH) && !defined(PACKAGE_BUILDING) @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif +.if !defined(BATCH) && !defined(PACKAGE_BUILDING) + @${CHOWN} -R gdm:gdm ${PREFIX}/share/gnome/gdm ${PREFIX}/etc/gdm +.else + @${CHOWN} -R 92:92 ${PREFIX}/share/gnome/gdm ${PREFIX}/etc/gdm +.endif + @${CHMOD} 0750 ${PREFIX}/share/gnome/gdm @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/x11/gdm/pkg-install b/x11/gdm/pkg-install index e373a44e33ca..df128647f968 100644 --- a/x11/gdm/pkg-install +++ b/x11/gdm/pkg-install @@ -36,8 +36,10 @@ if [ "$2" = "POST-INSTALL" ]; then exit 1 fi fi - ${CHOWN} -R ${USER}:${GROUP} ${PKG_PREFIX}/share/gnome/gdm ${PKG_PREFIX}/etc/gdm - ${CHMOD} 0750 ${PKG_PREFIX}/share/gnome/gdm + if [ -n "${PKG_PREFIX}" ]; then + ${CHOWN} -R ${USER}:${GROUP} ${PKG_PREFIX}/share/gnome/gdm ${PKG_PREFIX}/etc/gdm + ${CHMOD} 0750 ${PKG_PREFIX}/share/gnome/gdm + fi exit 0 fi diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile index 932bcabba2c2..b6ee39f88381 100644 --- a/x11/gdm2/Makefile +++ b/x11/gdm2/Makefile @@ -62,6 +62,12 @@ post-install: @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif @${INSTALL_SCRIPT} ${WRKSRC}/gdm.sh.sample ${PREFIX}/etc/rc.d +.if !defined(BATCH) && !defined(PACKAGE_BUILDING) + @${CHOWN} -R gdm:gdm ${PREFIX}/share/gnome/gdm ${PREFIX}/etc/gdm +.else + @${CHOWN} -R 92:92 ${PREFIX}/share/gnome/gdm ${PREFIX}/etc/gdm +.endif + @${CHMOD} 0750 ${PREFIX}/share/gnome/gdm @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/x11/gdm2/pkg-install b/x11/gdm2/pkg-install index e373a44e33ca..df128647f968 100644 --- a/x11/gdm2/pkg-install +++ b/x11/gdm2/pkg-install @@ -36,8 +36,10 @@ if [ "$2" = "POST-INSTALL" ]; then exit 1 fi fi - ${CHOWN} -R ${USER}:${GROUP} ${PKG_PREFIX}/share/gnome/gdm ${PKG_PREFIX}/etc/gdm - ${CHMOD} 0750 ${PKG_PREFIX}/share/gnome/gdm + if [ -n "${PKG_PREFIX}" ]; then + ${CHOWN} -R ${USER}:${GROUP} ${PKG_PREFIX}/share/gnome/gdm ${PKG_PREFIX}/etc/gdm + ${CHMOD} 0750 ${PKG_PREFIX}/share/gnome/gdm + fi exit 0 fi |