summaryrefslogtreecommitdiff
path: root/www/tomcat-native/files/patch-Makefile.in
blob: 555e8cc59a0aed17508c95a87f23d186a98fac50 (plain) (blame)
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
--- Makefile.in.orig	2017-08-23 23:12:17 UTC
+++ Makefile.in
@@ -49,13 +49,9 @@
 @INCLUDE_RULES@
 @INCLUDE_OUTPUTS@
 
-ifneq ($(CC_OLD),$(CC))
-    CC=$(CC_OLD)
-endif
-
-ifneq ($(LIBTOOL_OLD),$(LIBTOOL))
-    LIBTOOL=$(LIBTOOL_OLD)
-endif
+CC=$(CC_OLD)
+
+LIBTOOL=$(LIBTOOL_OLD)
 
 LINK          = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) -version-info $(TCNATIVE_LIBTOOL_VERSION) $(ALL_LDFLAGS) -o $@
 CLEAN_SUBDIRS = test
@@ -77,12 +73,7 @@
 
 
 install: $(TARGET_LIB)
-	$(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \
-		     $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
-	$(INSTALL_DATA) tcnative.pc $(DESTDIR)$(libdir)/pkgconfig/$(TCNATIVE_PCFILE)
-	list='$(INSTALL_SUBDIRS)'; for i in $$list; do \
-		( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \
-	done
+	$(APR_MKDIR) $(DESTDIR)$(libdir)
 	$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir)
 
 $(TARGET_LIB): $(OBJECTS)