diff options
| -rw-r--r-- | editors/xemacs-devel/Makefile | 18 | ||||
| -rw-r--r-- | editors/xemacs/Makefile | 18 | ||||
| -rw-r--r-- | editors/xemacs21/Makefile | 18 |
3 files changed, 6 insertions, 48 deletions
diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile index 2f7f452a9ed7..2e899fbe35e4 100644 --- a/editors/xemacs-devel/Makefile +++ b/editors/xemacs-devel/Makefile @@ -37,8 +37,8 @@ CONFIGURE_ARGS?=${XEMACS_ARCH} --prefix=${PREFIX} \ --with-clash-detection \ --lockdir=/var/run/emacs/lock \ --with-sound=native \ - --site-includes=${SITE_INCLUDES} \ - --site-libraries=${SITE_LIBRARIES} \ + --site-includes=${PREFIX}/include \ + --site-libraries=${PREFIX}/lib \ --with-session=yes \ --with-png=yes \ --with-tiff=yes \ @@ -98,17 +98,3 @@ post-install:: .endif .include <bsd.port.mk> - -# this makes it easier to test using PREFIX != LOCALBASE. Do not do -# this on bento. This has to go here because PREFIX and LOCALBASE are -# normally defined in bsd.port.mk. - -.if !defined(PACKAGE_BUILDING) -.if ${PREFIX} == ${LOCALBASE} -SITE_INCLUDES= ${PREFIX}/include -SITE_LIBRARIES= ${PREFIX}/lib -.else -SITE_INCLUDES= "${PREFIX}/include ${LOCALBASE}/include" -SITE_LIBRARIES= "${PREFIX}/lib ${LOCALBASE}/lib" -.endif -.endif diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile index 2f7f452a9ed7..2e899fbe35e4 100644 --- a/editors/xemacs/Makefile +++ b/editors/xemacs/Makefile @@ -37,8 +37,8 @@ CONFIGURE_ARGS?=${XEMACS_ARCH} --prefix=${PREFIX} \ --with-clash-detection \ --lockdir=/var/run/emacs/lock \ --with-sound=native \ - --site-includes=${SITE_INCLUDES} \ - --site-libraries=${SITE_LIBRARIES} \ + --site-includes=${PREFIX}/include \ + --site-libraries=${PREFIX}/lib \ --with-session=yes \ --with-png=yes \ --with-tiff=yes \ @@ -98,17 +98,3 @@ post-install:: .endif .include <bsd.port.mk> - -# this makes it easier to test using PREFIX != LOCALBASE. Do not do -# this on bento. This has to go here because PREFIX and LOCALBASE are -# normally defined in bsd.port.mk. - -.if !defined(PACKAGE_BUILDING) -.if ${PREFIX} == ${LOCALBASE} -SITE_INCLUDES= ${PREFIX}/include -SITE_LIBRARIES= ${PREFIX}/lib -.else -SITE_INCLUDES= "${PREFIX}/include ${LOCALBASE}/include" -SITE_LIBRARIES= "${PREFIX}/lib ${LOCALBASE}/lib" -.endif -.endif diff --git a/editors/xemacs21/Makefile b/editors/xemacs21/Makefile index 2f7f452a9ed7..2e899fbe35e4 100644 --- a/editors/xemacs21/Makefile +++ b/editors/xemacs21/Makefile @@ -37,8 +37,8 @@ CONFIGURE_ARGS?=${XEMACS_ARCH} --prefix=${PREFIX} \ --with-clash-detection \ --lockdir=/var/run/emacs/lock \ --with-sound=native \ - --site-includes=${SITE_INCLUDES} \ - --site-libraries=${SITE_LIBRARIES} \ + --site-includes=${PREFIX}/include \ + --site-libraries=${PREFIX}/lib \ --with-session=yes \ --with-png=yes \ --with-tiff=yes \ @@ -98,17 +98,3 @@ post-install:: .endif .include <bsd.port.mk> - -# this makes it easier to test using PREFIX != LOCALBASE. Do not do -# this on bento. This has to go here because PREFIX and LOCALBASE are -# normally defined in bsd.port.mk. - -.if !defined(PACKAGE_BUILDING) -.if ${PREFIX} == ${LOCALBASE} -SITE_INCLUDES= ${PREFIX}/include -SITE_LIBRARIES= ${PREFIX}/lib -.else -SITE_INCLUDES= "${PREFIX}/include ${LOCALBASE}/include" -SITE_LIBRARIES= "${PREFIX}/lib ${LOCALBASE}/lib" -.endif -.endif |