mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-11 07:22:22 +00:00
3e4ed01146
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG - Remove X11BASE support in favor of LOCALBASE or PREFIX - Use USE_LDCONFIG instead of INSTALLS_SHLIB - Remove unneeded USE_GCC 3.4+ Thanks to all Helpers: Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr, ehaupt, nox, itetcu, flz, pav PR: 116263 Tested on: pointyhat Approved by: portmgr (pav)
45 lines
1.3 KiB
Plaintext
45 lines
1.3 KiB
Plaintext
--- Makefile.orig Tue Apr 1 12:13:32 1997
|
|
+++ Makefile Tue Jul 2 01:19:28 2002
|
|
@@ -16,11 +16,14 @@
|
|
# want to remove the -DXFORMS86 declaration in the CCFLAG
|
|
# assignment.
|
|
#
|
|
-CCFLAG = -O2 -Wall -DXFORMS86
|
|
-CC = gcc
|
|
-COMMONLIBS = -L/usr/X11R6/lib/ -lX11 -lm
|
|
-SHAREDLIBS = -lforms
|
|
-STATICLIBS = -lXpm /usr/X11R6/lib/libforms.a
|
|
+.if exists(${LOCALBASE}/include/X11/forms.h)
|
|
+XFORMSINC = -I${LOCALBASE}/include/X11
|
|
+.endif
|
|
+CCFLAG = $(CFLAGS) -DXFORMS86 -DPREFIX=\"$(PREFIX)\" -I$(LOCALBASE)/include ${XFORMSINC}
|
|
+#CC = gcc
|
|
+COMMONLIBS = -L$(LOCALBASE)/lib/ -lX11 -lm
|
|
+SHAREDLIBS = -lforms -lXpm
|
|
+STATICLIBS = $(LOCALBASE)/lib/libxforms.a -lXpm
|
|
ECHO = echo
|
|
RM = rm
|
|
RMOPTS = -f
|
|
@@ -29,9 +32,9 @@
|
|
INSTALL = install
|
|
INSTALLOPTS = -d
|
|
|
|
-BINDIR = /usr/local/bin
|
|
-MANDIR = /usr/man/man1
|
|
-HELPDIR = /usr/local/xldlas/help
|
|
+BINDIR = $(PREFIX)/bin
|
|
+MANDIR = $(PREFIX)/man/man1
|
|
+HELPDIR = $(PREFIX)/share/xldlas/help
|
|
SRCDIR := $$PWD
|
|
USER := $$LOGNAME
|
|
|
|
@@ -115,7 +118,7 @@
|
|
so the following commands will probably fail"; fi
|
|
@$(ECHO)
|
|
@$(CP) $(CPOPTS) xldlas $(BINDIR)
|
|
- @if test '/usr/local/xldlas' = $(SRCDIR); then \
|
|
+ @if test '/usr/local/share/xldlas' = $(SRCDIR); then \
|
|
$(ECHO) Help Files Already in Place; else \
|
|
$(INSTALL) $(INSTALLOPTS) ./help $(HELPDIR); fi
|
|
install.man:
|