respect CC/CFLAGS
change to unified diff format add cvs tag
This commit is contained in:
wilfried
parent
8777ceefe6
commit
f64648eb9a
@ -1,93 +1,70 @@
|
||||
*** Makefile.orig Sun Nov 23 18:07:22 1997
|
||||
--- Makefile Sun Nov 23 18:24:24 1997
|
||||
***************
|
||||
*** 1,14 ****
|
||||
# Compiler: eg. cc or gcc
|
||||
CC = cc
|
||||
|
||||
# Directory to install tcplist executable
|
||||
! BINDIR = /local/bin
|
||||
|
||||
# Directory to install tcplist man page
|
||||
! MANDIR = /local/man/man1
|
||||
|
||||
# Location of NOIDENT file
|
||||
! NOIDENT = /etc/hosts.noident
|
||||
|
||||
# Owner of tcplist executable
|
||||
OWNER = root
|
||||
--- 1,16 ----
|
||||
# Compiler: eg. cc or gcc
|
||||
CC = cc
|
||||
|
||||
+ #PREFIX= /local
|
||||
+
|
||||
# Directory to install tcplist executable
|
||||
! BINDIR = $(PREFIX)/bin
|
||||
|
||||
# Directory to install tcplist man page
|
||||
! MANDIR = $(PREFIX)/man/man1
|
||||
|
||||
# Location of NOIDENT file
|
||||
! NOIDENT = $(PREFIX)/etc/hosts.noident
|
||||
|
||||
# Owner of tcplist executable
|
||||
OWNER = root
|
||||
***************
|
||||
*** 45,62 ****
|
||||
#
|
||||
# Solaris 2.x (using LSOF):
|
||||
#
|
||||
! LIBRARIES = -lsocket -lnsl
|
||||
! DEFS = -DLSOF
|
||||
! MODE = 755
|
||||
! GROUP = staff
|
||||
|
||||
#
|
||||
# Generic LSOF:
|
||||
#
|
||||
! # LIBRARIES =
|
||||
! # DEFS = -DLSOF
|
||||
! # MODE = 755
|
||||
! # GROUP = staff
|
||||
#
|
||||
|
||||
# If you're using an old version of lsof, uncomment this:
|
||||
--- 47,64 ----
|
||||
#
|
||||
# Solaris 2.x (using LSOF):
|
||||
#
|
||||
! #LIBRARIES = -lsocket -lnsl
|
||||
! #DEFS = -DLSOF
|
||||
! #MODE = 755
|
||||
! #GROUP = staff
|
||||
|
||||
#
|
||||
# Generic LSOF:
|
||||
#
|
||||
! LIBRARIES =
|
||||
! DEFS = -DLSOF
|
||||
! MODE = 755
|
||||
! GROUP = staff
|
||||
#
|
||||
|
||||
# If you're using an old version of lsof, uncomment this:
|
||||
***************
|
||||
*** 76,83 ****
|
||||
RM = /bin/rm -rf
|
||||
CP = /bin/cp
|
||||
CHMOD = /bin/chmod
|
||||
! CHOWN = /bin/chown
|
||||
! CHGRP = /bin/chgrp
|
||||
|
||||
all:: tcplist
|
||||
|
||||
--- 78,85 ----
|
||||
RM = /bin/rm -rf
|
||||
CP = /bin/cp
|
||||
CHMOD = /bin/chmod
|
||||
! CHOWN = /usr/sbin/chown
|
||||
! CHGRP = /usr/sbin/chgrp
|
||||
|
||||
all:: tcplist
|
||||
|
||||
$OpenBSD: patch-01,v 1.3 2001/03/12 15:02:26 wilfried Exp $
|
||||
--- Makefile.orig Mon Mar 12 16:01:00 2001
|
||||
+++ Makefile Mon Mar 12 16:01:00 2001
|
||||
@@ -1,14 +1,16 @@
|
||||
# Compiler: eg. cc or gcc
|
||||
-CC = cc
|
||||
+#CC = cc
|
||||
+
|
||||
+#PREFIX= /local
|
||||
|
||||
# Directory to install tcplist executable
|
||||
-BINDIR = /local/bin
|
||||
+BINDIR = $(PREFIX)/bin
|
||||
|
||||
# Directory to install tcplist man page
|
||||
-MANDIR = /local/man/man1
|
||||
+MANDIR = $(PREFIX)/man/man1
|
||||
|
||||
# Location of NOIDENT file
|
||||
-NOIDENT = /etc/hosts.noident
|
||||
+NOIDENT = $(PREFIX)/etc/hosts.noident
|
||||
|
||||
# Owner of tcplist executable
|
||||
OWNER = root
|
||||
@@ -45,25 +47,25 @@ MANEXT = 1
|
||||
#
|
||||
# Solaris 2.x (using LSOF):
|
||||
#
|
||||
-LIBRARIES = -lsocket -lnsl
|
||||
-DEFS = -DLSOF
|
||||
-MODE = 755
|
||||
-GROUP = staff
|
||||
+#LIBRARIES = -lsocket -lnsl
|
||||
+#DEFS = -DLSOF
|
||||
+#MODE = 755
|
||||
+#GROUP = staff
|
||||
|
||||
#
|
||||
# Generic LSOF:
|
||||
#
|
||||
-# LIBRARIES =
|
||||
-# DEFS = -DLSOF
|
||||
-# MODE = 755
|
||||
-# GROUP = staff
|
||||
+ LIBRARIES =
|
||||
+ DEFS = -DLSOF
|
||||
+ MODE = 755
|
||||
+ GROUP = staff
|
||||
#
|
||||
|
||||
# If you're using an old version of lsof, uncomment this:
|
||||
# DEFS = -DLSOF -DOLDLSOF
|
||||
|
||||
# CFLAGS = $(DEFS) -DNOIDENT=\"$(NOIDENT)\" -O
|
||||
-CFLAGS = $(DEFS) -DDEBUG -DNOIDENT=\"$(NOIDENT)\" -g
|
||||
+CFLAGS += $(DEFS) -DDEBUG -DNOIDENT=\"$(NOIDENT)\"
|
||||
|
||||
#
|
||||
# End of user-configurable options
|
||||
@@ -76,8 +78,8 @@ OBJS = $(SRCS:.c=.o)
|
||||
RM = /bin/rm -rf
|
||||
CP = /bin/cp
|
||||
CHMOD = /bin/chmod
|
||||
-CHOWN = /bin/chown
|
||||
-CHGRP = /bin/chgrp
|
||||
+CHOWN = /usr/sbin/chown
|
||||
+CHGRP = /usr/sbin/chgrp
|
||||
|
||||
all:: tcplist
|
||||
|
||||
|
||||
@ -1,19 +1,12 @@
|
||||
*** lsof.c.orig Tue Nov 25 19:07:17 1997
|
||||
--- lsof.c Tue Nov 25 19:04:03 1997
|
||||
***************
|
||||
*** 27,33 ****
|
||||
#define LSOFCMD "lsof -HPsli TCP | awk '{print $3,$NF}' | sort | uniq"
|
||||
#else /* !OLDLSOF */
|
||||
/* These use the current (as of 3.62W, at least) parameters for lsof */
|
||||
! #define LSOFCMD "lsof -nPsli TCP | awk '{print $3,$NF}' | sort | uniq"
|
||||
#endif /* !OLDLSOF */
|
||||
#endif /* LSOFCMD */
|
||||
|
||||
--- 27,33 ----
|
||||
#define LSOFCMD "lsof -HPsli TCP | awk '{print $3,$NF}' | sort | uniq"
|
||||
#else /* !OLDLSOF */
|
||||
/* These use the current (as of 3.62W, at least) parameters for lsof */
|
||||
! #define LSOFCMD "lsof -nPsli TCP | awk '{print $3,$(NF - 1)}' | sort | uniq"
|
||||
#endif /* !OLDLSOF */
|
||||
#endif /* LSOFCMD */
|
||||
|
||||
$OpenBSD: patch-02,v 1.2 2001/03/12 15:02:26 wilfried Exp $
|
||||
--- lsof.c.orig Mon Mar 12 16:01:00 2001
|
||||
+++ lsof.c Mon Mar 12 16:01:00 2001
|
||||
@@ -27,7 +27,7 @@
|
||||
#define LSOFCMD "lsof -HPsli TCP | awk '{print $3,$NF}' | sort | uniq"
|
||||
#else /* !OLDLSOF */
|
||||
/* These use the current (as of 3.62W, at least) parameters for lsof */
|
||||
-#define LSOFCMD "lsof -nPsli TCP | awk '{print $3,$NF}' | sort | uniq"
|
||||
+#define LSOFCMD "lsof -nPsli TCP | awk '{print $3,$(NF - 1)}' | sort | uniq"
|
||||
#endif /* !OLDLSOF */
|
||||
#endif /* LSOFCMD */
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user