Fix package build and package deinstall when not using GNOME.

PR:		42545
Noticed by:	bento & Udo Schweigert <udo.schweigert@siemens.com>
This commit is contained in:
Cy Schubert 2002-09-09 00:56:05 +00:00
parent b95103c143
commit 5686db2567
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=65868
4 changed files with 16 additions and 6 deletions

View file

@ -30,7 +30,7 @@ WANT_GNOME= yes
.include <bsd.port.pre.mk>
.if ${HAVE_GNOME:Mimlib}!=""
.if ${HAVE_GNOME:Mimlib}!="" && !defined(WITHOUT_GNOME)
USE_GNOME+= imlib
PKGNAMESUFFIX= -imlib
.endif
@ -52,8 +52,11 @@ CONFIGURE_ARGS+= --disable-shape
PLIST_SUB+= FVWM_VERSION="${PORTVERSION}"
.if defined(HAVE_GNOME)
.if defined(HAVE_GNOME) && !defined(WITHOUT_GNOME)
USE_GNOME= yes
CONFIGURE_ARGS+= --with-gnome --enable-gnome-hints \
--enable-gtktest --enable-imlibtest
PLIST_SUB+= GNOMEDATADIR="share/fvwm"
PLIST_SUB+= GNOMEDATADIR="share/gnome/fvwm"
.else
CONFIGURE_ARGS+= --without-gnome --disable-gnome-hints \

View file

@ -5,6 +5,8 @@ bin/fvwm-menu-directory
bin/fvwm-menu-headlines
bin/fvwm-menu-xlock
bin/fvwm2
bin/fvwm
bin/fvwm-root
bin/fvwm24_convert
bin/fvwmbug
bin/xpmroot
@ -29,7 +31,7 @@ libexec/fvwm/%%FVWM_VERSION%%/FvwmDebug
libexec/fvwm/%%FVWM_VERSION%%/FvwmDragWell
libexec/fvwm/%%FVWM_VERSION%%/FvwmEvent
libexec/fvwm/%%FVWM_VERSION%%/FvwmForm
%%GNOME:%%libexec/fvwm/%%FVWM_VERSION%%/FvwmGtk
libexec/fvwm/%%FVWM_VERSION%%/FvwmGtk
libexec/fvwm/%%FVWM_VERSION%%/FvwmIconBox
libexec/fvwm/%%FVWM_VERSION%%/FvwmIconMan
libexec/fvwm/%%FVWM_VERSION%%/FvwmIdent

View file

@ -30,7 +30,7 @@ WANT_GNOME= yes
.include <bsd.port.pre.mk>
.if ${HAVE_GNOME:Mimlib}!=""
.if ${HAVE_GNOME:Mimlib}!="" && !defined(WITHOUT_GNOME)
USE_GNOME+= imlib
PKGNAMESUFFIX= -imlib
.endif
@ -52,8 +52,11 @@ CONFIGURE_ARGS+= --disable-shape
PLIST_SUB+= FVWM_VERSION="${PORTVERSION}"
.if defined(HAVE_GNOME)
.if defined(HAVE_GNOME) && !defined(WITHOUT_GNOME)
USE_GNOME= yes
CONFIGURE_ARGS+= --with-gnome --enable-gnome-hints \
--enable-gtktest --enable-imlibtest
PLIST_SUB+= GNOMEDATADIR="share/fvwm"
PLIST_SUB+= GNOMEDATADIR="share/gnome/fvwm"
.else
CONFIGURE_ARGS+= --without-gnome --disable-gnome-hints \

View file

@ -5,6 +5,8 @@ bin/fvwm-menu-directory
bin/fvwm-menu-headlines
bin/fvwm-menu-xlock
bin/fvwm2
bin/fvwm
bin/fvwm-root
bin/fvwm24_convert
bin/fvwmbug
bin/xpmroot
@ -29,7 +31,7 @@ libexec/fvwm/%%FVWM_VERSION%%/FvwmDebug
libexec/fvwm/%%FVWM_VERSION%%/FvwmDragWell
libexec/fvwm/%%FVWM_VERSION%%/FvwmEvent
libexec/fvwm/%%FVWM_VERSION%%/FvwmForm
%%GNOME:%%libexec/fvwm/%%FVWM_VERSION%%/FvwmGtk
libexec/fvwm/%%FVWM_VERSION%%/FvwmGtk
libexec/fvwm/%%FVWM_VERSION%%/FvwmIconBox
libexec/fvwm/%%FVWM_VERSION%%/FvwmIconMan
libexec/fvwm/%%FVWM_VERSION%%/FvwmIdent