Added
Link Here
|
1 |
--- GNUmakefile.orig 2020-05-23 16:23:54 UTC |
2 |
+++ GNUmakefile |
3 |
@@ -83,15 +83,15 @@ endif |
4 |
|
5 |
|
6 |
# -------------------------------------------------------------------------- |
7 |
-# DESTDIR directory |
8 |
-ifndef DESTDIR |
9 |
- DESTDIR := /usr |
10 |
+# MYDESTDIR directory |
11 |
+ifndef MYDESTDIR |
12 |
+ MYDESTDIR := /usr |
13 |
endif |
14 |
|
15 |
# -------------------------------------------------------------------------- |
16 |
# LIBDIR directory |
17 |
ifndef LIBDIR |
18 |
- LIBDIR := ${DESTDIR}/lib |
19 |
+ LIBDIR := ${MYDESTDIR}/lib |
20 |
endif |
21 |
|
22 |
# -------------------------------------------------------------------------- |
23 |
@@ -149,7 +149,7 @@ CFLAGS += -Wall -Werror -Wshadow -Wextra -Wno-format-t |
24 |
LDFLAGS = $(CURL_LIBS) $(LIBXML2_LIBS) $(OPENSSL_LIBS) -lpthread |
25 |
|
26 |
STRIP ?= strip |
27 |
-INSTALL := install --strip-program=$(STRIP) |
28 |
+MYINSTALL := install --strip-program=$(STRIP) |
29 |
|
30 |
|
31 |
# -------------------------------------------------------------------------- |
32 |
@@ -171,12 +171,12 @@ exported: libs3 s3 headers |
33 |
|
34 |
.PHONY: install |
35 |
install: exported |
36 |
- $(QUIET_ECHO) $(DESTDIR)/bin/s3: Installing executable |
37 |
- $(VERBOSE_SHOW) $(INSTALL) -Dps -m u+rwx,go+rx $(BUILD)/bin/s3 \ |
38 |
- $(DESTDIR)/bin/s3 |
39 |
+ $(QUIET_ECHO) $(MYDESTDIR)/bin/s3: Installing executable |
40 |
+ $(VERBOSE_SHOW) $(MYINSTALL) -Dps -m u+rwx,go+rx $(BUILD)/bin/s3 \ |
41 |
+ $(MYDESTDIR)/bin/s3 |
42 |
$(QUIET_ECHO) \ |
43 |
$(LIBDIR)/libs3.so.$(LIBS3_VER): Installing shared library |
44 |
- $(VERBOSE_SHOW) $(INSTALL) -Dps -m u+rw,go+r \ |
45 |
+ $(VERBOSE_SHOW) $(MYINSTALL) -Dps -m u+rw,go+r \ |
46 |
$(BUILD)/lib/libs3.so.$(LIBS3_VER_MAJOR) \ |
47 |
$(LIBDIR)/libs3.so.$(LIBS3_VER) |
48 |
$(QUIET_ECHO) \ |
49 |
@@ -186,11 +186,11 @@ install: exported |
50 |
$(QUIET_ECHO) $(LIBDIR)/libs3.so: Linking shared library |
51 |
$(VERBOSE_SHOW) ln -sf libs3.so.$(LIBS3_VER_MAJOR) $(LIBDIR)/libs3.so |
52 |
$(QUIET_ECHO) $(LIBDIR)/libs3.a: Installing static library |
53 |
- $(VERBOSE_SHOW) $(INSTALL) -Dp -m u+rw,go+r $(BUILD)/lib/libs3.a \ |
54 |
+ $(VERBOSE_SHOW) $(MYINSTALL) -Dp -m u+rw,go+r $(BUILD)/lib/libs3.a \ |
55 |
$(LIBDIR)/libs3.a |
56 |
- $(QUIET_ECHO) $(DESTDIR)/include/libs3.h: Installing header |
57 |
- $(VERBOSE_SHOW) $(INSTALL) -Dp -m u+rw,go+r $(BUILD)/include/libs3.h \ |
58 |
- $(DESTDIR)/include/libs3.h |
59 |
+ $(QUIET_ECHO) $(MYDESTDIR)/include/libs3.h: Installing header |
60 |
+ $(VERBOSE_SHOW) $(MYINSTALL) -Dp -m u+rw,go+r $(BUILD)/include/libs3.h \ |
61 |
+ $(MYDESTDIR)/include/libs3.h |
62 |
|
63 |
|
64 |
# -------------------------------------------------------------------------- |
65 |
@@ -200,12 +200,12 @@ install: exported |
66 |
uninstall: |
67 |
$(QUIET_ECHO) Installed files: Uninstalling |
68 |
$(VERBOSE_SHOW) \ |
69 |
- rm -f $(DESTDIR)/bin/s3 \ |
70 |
- $(DESTDIR)/include/libs3.h \ |
71 |
- $(DESTDIR)/lib/libs3.a \ |
72 |
- $(DESTDIR)/lib/libs3.so \ |
73 |
- $(DESTDIR)/lib/libs3.so.$(LIBS3_VER_MAJOR) \ |
74 |
- $(DESTDIR)/lib/libs3.so.$(LIBS3_VER) |
75 |
+ rm -f $(MYDESTDIR)/bin/s3 \ |
76 |
+ $(MYDESTDIR)/include/libs3.h \ |
77 |
+ $(MYDESTDIR)/lib/libs3.a \ |
78 |
+ $(MYDESTDIR)/lib/libs3.so \ |
79 |
+ $(MYDESTDIR)/lib/libs3.so.$(LIBS3_VER_MAJOR) \ |
80 |
+ $(MYDESTDIR)/lib/libs3.so.$(LIBS3_VER) |
81 |
|
82 |
|
83 |
# -------------------------------------------------------------------------- |
84 |
@@ -338,7 +338,7 @@ $(DEBPKG): exported $(BUILD)/deb/DEBIAN/control $(BUIL |
85 |
$(BUILD)/deb/usr/share/doc/libs3/changelog.gz \ |
86 |
$(BUILD)/deb/usr/share/doc/libs3/changelog.Debian.gz \ |
87 |
$(BUILD)/deb/usr/share/doc/libs3/copyright |
88 |
- DESTDIR=$(BUILD)/deb/usr $(MAKE) install |
89 |
+ MYDESTDIR=$(BUILD)/deb/usr $(MAKE) install |
90 |
rm -rf $(BUILD)/deb/usr/include |
91 |
rm -f $(BUILD)/deb/usr/lib/libs3.a |
92 |
@mkdir -p $(dir $@) |
93 |
@@ -351,7 +351,7 @@ $(DEBDEVPKG): exported $(BUILD)/deb-dev/DEBIAN/control |
94 |
$(BUILD)/deb-dev/usr/share/doc/libs3-dev/changelog.gz \ |
95 |
$(BUILD)/deb-dev/usr/share/doc/libs3-dev/changelog.Debian.gz \ |
96 |
$(BUILD)/deb-dev/usr/share/doc/libs3-dev/copyright |
97 |
- DESTDIR=$(BUILD)/deb-dev/usr $(MAKE) install |
98 |
+ MYDESTDIR=$(BUILD)/deb-dev/usr $(MAKE) install |
99 |
rm -rf $(BUILD)/deb-dev/usr/bin |
100 |
rm -f $(BUILD)/deb-dev/usr/lib/libs3.so* |
101 |
@mkdir -p $(dir $@) |