summaryrefslogtreecommitdiff
path: root/devel/exctags/patches/patch-aa
blob: 55823362a5d6ebade86a87c80a170cfaa0bf6f9d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
$NetBSD: patch-aa,v 1.3 2002/03/06 16:45:02 seb Exp $

--- Makefile.in.orig	Sun Feb 17 22:42:06 2002
+++ Makefile.in
@@ -6,8 +6,8 @@
 # These are the names of the installed programs, in case you wish to change
 # them.
 #
-CTAGS_PROG = ctags
-ETAGS_PROG = etags
+CTAGS_PROG = exctags
+ETAGS_PROG = exetags
 
 # Set this to the path to your shell (must run Bourne shell commands).
 #
@@ -28,6 +28,7 @@
 CC	= @CC@
 DEFS	= @DEFS@
 CFLAGS	= @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
 LDFLAGS	= @LDFLAGS@
 LIBS	= @LIBS@
 EXEEXT	= @EXEEXT@
@@ -59,9 +60,9 @@
 
 VPATH	= $(srcdir)
 
-INSTALL		= cp
-INSTALL_PROG	= $(INSTALL)
-INSTALL_DATA	= $(INSTALL)
+INSTALL_PROGRAM = $(BSD_INSTALL_PROGRAM)
+INSTALL_MAN     = $(BSD_INSTALL_MAN)
+INSTALL_DATA    = $(BSD_INSTALL_DATA)
 
 READ_LIB = readtags.$(OBJEXT)
 READ_INC = readtags.h
@@ -103,14 +104,14 @@
 	$(CC) -I. -I$(srcdir) $(DEFS) -DDEBUG -g $(LDFLAGS) -o $@ debug.c $(SOURCES)
 
 readtags$(EXEEXT): readtags.c readtags.h
-	$(CC) -DREADTAGS_MAIN -I. -I$(srcdir) $(DEFS) $(CFLAGS) $(LDFLAGS) -o $@ readtags.c
+	$(CC) -DREADTAGS_MAIN -I. -I$(srcdir) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ readtags.c
 
 ETYPEREF_OBJS = etyperef.o keyword.o routines.o strlist.o vstring.o
 etyperef$(EXEEXT): $(ETYPEREF_OBJS)
 	$(CC) $(LDFLAGS) -o $@ $(ETYPEREF_OBJS)
 
 etyperef.o: eiffel.c
-	$(CC) -DTYPE_REFERENCE_TOOL -I. -I$(srcdir) $(DEFS) $(CFLAGS) -o $@ -c eiffel.c
+	$(CC) -DTYPE_REFERENCE_TOOL -I. -I$(srcdir) $(DEFS) $(CPPFLAGS) $(CFLAGS) -o $@ -c eiffel.c
 
 $(OBJECTS): $(HEADERS) config.h
 
@@ -138,8 +139,7 @@
 install-lib: $(DEST_READ_LIB) $(DEST_READ_INC)
 
 $(DEST_CTAGS): $(CTAGS_EXEC) $(bindir) FORCE
-	$(INSTALL_PROG) $(CTAGS_EXEC) $@  &&  chmod 755 $@
-	$(STRIP) $(DEST_CTAGS)
+	$(INSTALL_PROGRAM) $(CTAGS_EXEC) $@
 
 $(DEST_ETAGS):
 	- if [ -x $(DEST_CTAGS) ]; then \
@@ -154,7 +154,7 @@
 install-eman: $(DEST_EMAN)
 
 $(DEST_CMAN): $(man1dir) $(MANPAGE) FORCE
-	- $(INSTALL_DATA) $(srcdir)/$(MANPAGE) $@  &&  chmod 644 $@
+	- $(INSTALL_MAN) $(srcdir)/$(MANPAGE) $@
 
 $(DEST_EMAN):
 	- if [ -f $(DEST_CMAN) ]; then \
@@ -165,10 +165,10 @@
 # install the library
 #
 $(DEST_READ_LIB): $(READ_LIB) $(libdir) FORCE
-	$(INSTALL_PROG) $(READ_LIB) $@  &&  chmod 644 $@
+	 $(INSTALL_DATA) $(READ_LIB) $@
 
 $(DEST_READ_INC): $(READ_INC) $(incdir) FORCE
-	$(INSTALL_PROG) $(READ_INC) $@  &&  chmod 644 $@
+	$(INSTALL_DATA) $(READ_INC) $@
 
 
 #
@@ -217,6 +217,6 @@
 # implicit rules
 #
 .c.$(OBJEXT):
-	$(CC) -I. -I$(srcdir) $(DEFS) $(CFLAGS) -c $<
+	$(CC) -I. -I$(srcdir) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c $<
 
 # vi:set tabstop=8: