1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-01 22:05:08 +00:00
freebsd-ports/comms/minicom/files/patch-aa
David E. O'Brien 1ba6f38710 Respect CFLAGS and CC.
Submitted by:	Mikhail Teterin <mi@misha.cisco.com> (reworked by me)
1999-04-14 17:08:00 +00:00

102 lines
2.7 KiB
Plaintext

--- Makefile.orig Sat Jul 25 12:05:46 1998
+++ Makefile Wed Apr 14 10:04:18 1999
@@ -22,10 +22,10 @@
#
# Where to install things for Linux sites (FSSTND)
-BINDIR = /usr/bin
-LIBDIR = /etc
-DOCDIR = /usr/doc/minicom
-MANDIR = /usr/man/man1
+# BINDIR = /usr/bin
+# LIBDIR = /etc
+# DOCDIR = /usr/doc/minicom
+# MANDIR = /usr/man/man1
# fmg 8/22/97: seems a more logical place for this :-)
# Select Compile Options you want:
@@ -40,18 +40,18 @@
# -D_I18N_ - Internationalization and localized text strings
# see file "../doc/Locales"
#
-OPFLAGS = -D_HISTORY -D_HAVE_MACROS -D_SEARCH_HISTORY -D_I18N_
+OPFLAGS = -D_HISTORY -D_HAVE_MACROS -D_SEARCH_HISTORY ## -D_I18N_
# Remove if you don't have gettext and don't want to install it and use
# the localized strings
PO = po
# Where to install things for FreeBSD sites.
-# BINDIR = /usr/local/bin
-# LIBDIR = /usr/local/etc/minicom
+BINDIR = $(PREFIX)/bin
+LIBDIR = $(PREFIX)/etc/minicom
##DOCDIR = /usr/local/share/minicom
-# DOCDIR = /usr/local/etc/minicom
-# MANDIR = /usr/local/man/man1
+DOCDIR = $(PREFIX)/etc/minicom
+MANDIR = $(PREFIX)/man/man1
# Where to install things for "normal" sites.
# BINDIR = /usr/local/bin
@@ -60,17 +60,17 @@
# MANDIR = /usr/local/man/man1
# Take these compilation flags for Linux with libncurses.
-FLAGS = -Wall -D_POSIX -D_SYSV -D_SELECT -pipe # -I/usr/include/ncurses
-PROGS = minicom runscript ascii-xfr
-LFLAGS = -s
-LIBS = -lncurses #-lintl
-CC = cc
+# FLAGS = -Wall -D_POSIX -D_SYSV -D_SELECT -pipe # -I/usr/include/ncurses
+# PROGS = minicom runscript ascii-xfr
+# LFLAGS = -s
+# LIBS = -lncurses #-lintl
+# CC = cc
# Take these compilation flags for FreeBSD.
-#FLAGS = -Wall -D_POSIX -D_BSD43 -D_SELECT -D_DCDFLOW
-#PROGS = minicom runscript ascii-xfr
-#LFLAGS = -s
-#LIBS = -ltermcap
+FLAGS = -Wall -D_POSIX -D_BSD43 -D_SELECT -D_DCDFLOW -D_HAVE_MACROS
+PROGS = minicom runscript ascii-xfr
+LFLAGS = -s
+LIBS = -ltermcap -lcurses
#CC = cc
# Take these flags for SCO unix.
@@ -178,7 +178,7 @@
SOBJS = script.o sysdep1.o common.o
# fmg 8/22/97: merge in new OPFLAGS...
-CFLAGS = $(FLAGS) $(OPFLAGS) -DLIBDIR=\"$(LIBDIR)\"
+CFLAGS += $(FLAGS) $(OPFLAGS) -DLIBDIR=\"$(LIBDIR)\"
R = $(ROOTDIR)
@@ -188,7 +188,7 @@
$(CC) $(LFLAGS) -o minicom $(MOBJS) $(LIBS)
po: dummy
- make -C po
+ ## cd po ; $(MAKE)
keyserv: $(KOBJS)
$(CC) -o keyserv $(LFLAGS) $(KOBJS) $(LIBS)
@@ -241,12 +241,12 @@
dummy:
install: $(PROGS)
- make -C po install R=$(R)
+ ## cd po ; $(MAKE) install R=$(R)
sh install.sh $(R)$(LIBDIR) $(R)$(BINDIR) $(R)$(MANDIR) $(R)$(DOCDIR)
clobber:
rm -f *.o *~ minicom keyserv runscript ascii-xfr
- make -C po clean
+ ## cd po ; $(MAKE) clean
clean:
rm -f *.o