mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-14 23:46:10 +00:00
ac8274b67c
- installing in libexec directory isn't useful
- app-defaults file could only be found when XAPPLRESDIR
enviroment variable is set -> patch in sourcefile is needed
- some compiler warnings and gets usage is fixed
- wrong usage of isnumber macro fixed
PR: 11768
Submitted by: Lars Koeller <lkoeller@cc.fh-lippe.de>
114 lines
3.0 KiB
Plaintext
114 lines
3.0 KiB
Plaintext
*** Makefile.orig Mon May 12 17:55:59 1997
|
|
--- Makefile Tue May 18 21:22:21 1999
|
|
***************
|
|
*** 6,30 ****
|
|
|
|
.SUFFIXES: .c .o
|
|
|
|
! CC =gcc
|
|
RM =rm
|
|
LN =ln
|
|
! INSTALL =install
|
|
CP =cp
|
|
TAR =tar
|
|
GZIP =gzip
|
|
|
|
# Binary directory for make install
|
|
! BINDIR =/usr/local/bin/X11
|
|
|
|
# Library directories for Linux
|
|
! XLIBDIR =/usr/X11R6/lib
|
|
|
|
# Include directory for gcc (if you get X11/Xlib.h: file not found)
|
|
! #INCDIR =-I/usr/X11R6/include
|
|
|
|
# Library directories for the Ultrix (probably most Unixes)
|
|
! #XLIBDIR =/usr/lib/X11
|
|
|
|
# Comment out the following line if you do not have the XPM library.
|
|
XPM =-DHAS_XPM
|
|
--- 6,30 ----
|
|
|
|
.SUFFIXES: .c .o
|
|
|
|
! CC ?=gcc
|
|
RM =rm
|
|
LN =ln
|
|
! INSTALL ?=install
|
|
CP =cp
|
|
TAR =tar
|
|
GZIP =gzip
|
|
|
|
# Binary directory for make install
|
|
! BINDIR =$(PREFIX)/bin
|
|
|
|
# Library directories for Linux
|
|
! XLIBDIR =$(X11BASE)/lib
|
|
|
|
# Include directory for gcc (if you get X11/Xlib.h: file not found)
|
|
! INCDIR =-I$(X11BASE)/include
|
|
|
|
# Library directories for the Ultrix (probably most Unixes)
|
|
! XLIBDIR =$(X11BASE)/lib
|
|
|
|
# Comment out the following line if you do not have the XPM library.
|
|
XPM =-DHAS_XPM
|
|
***************
|
|
*** 34,40 ****
|
|
$(CC) $(INCDIR) $(CFLAGS) $(XPM) -c $*.c
|
|
|
|
# Linux CFLAGS (actually generic gcc)
|
|
! CFLAGS=-Wall -O2
|
|
|
|
# Want static binaries?
|
|
#CFLAGS=-Wall -O2 -static
|
|
--- 34,40 ----
|
|
$(CC) $(INCDIR) $(CFLAGS) $(XPM) -c $*.c
|
|
|
|
# Linux CFLAGS (actually generic gcc)
|
|
! CFLAGS+= -O2
|
|
|
|
# Want static binaries?
|
|
#CFLAGS=-Wall -O2 -static
|
|
***************
|
|
*** 48,54 ****
|
|
# Most Linux users won't be troubled by this. Actually almost nobody will
|
|
# be troubled by this. It just might save me a couple of emails...
|
|
# Just change it to wherever your libX11.a resides.
|
|
! LDFLAGS=-L$(XLIBDIR)
|
|
|
|
all: xbanner freetemp random_effect xb_check
|
|
|
|
--- 48,54 ----
|
|
# Most Linux users won't be troubled by this. Actually almost nobody will
|
|
# be troubled by this. It just might save me a couple of emails...
|
|
# Just change it to wherever your libX11.a resides.
|
|
! LDFLAGS+=-L$(XLIBDIR)
|
|
|
|
all: xbanner freetemp random_effect xb_check
|
|
|
|
***************
|
|
*** 70,79 ****
|
|
xb_check: xb_check.o
|
|
$(CC) $(CFLAGS) -o xb_check xb_check.o
|
|
|
|
! install: freetemp xbanner xb_check
|
|
! $(INSTALL) --strip --mode "0755" --owner root --group bin freetemp $(BINDIR)/freetemp
|
|
! $(INSTALL) --strip --mode "0755" --owner root --group bin xbanner $(BINDIR)/xbanner
|
|
! $(INSTALL) --strip --mode "0755" --owner root --group bin xb_check $(BINDIR)/xb_check
|
|
|
|
strip: exe
|
|
strip xbanner freetemp xb_check random_effect
|
|
--- 70,80 ----
|
|
xb_check: xb_check.o
|
|
$(CC) $(CFLAGS) -o xb_check xb_check.o
|
|
|
|
! install: freetemp xbanner xb_check random_effect
|
|
! $(INSTALL) -cs -g bin -m "0755" -o root freetemp $(BINDIR)/freetemp
|
|
! $(INSTALL) -cs -g bin -m "0755" -o root xbanner $(BINDIR)/xbanner
|
|
! $(INSTALL) -cs -g bin -m "0755" -o root xb_check $(BINDIR)/xb_check
|
|
! $(INSTALL) -cs -g bin -m "0755" -o root random_effect $(BINDIR)/random_effect
|
|
|
|
strip: exe
|
|
strip xbanner freetemp xb_check random_effect
|