]>
Commit | Line | Data |
---|---|---|
6884be5b | 1 | diff -Nur stunnel-3.20-orig/Makefile.in stunnel-3.20/Makefile.in |
2 | --- stunnel-3.20-orig/Makefile.in Tue Oct 16 11:57:38 2001 | |
3 | +++ stunnel-3.20/Makefile.in Tue Oct 16 12:00:25 2001 | |
c039e015 | 4 | @@ -20,7 +20,7 @@ |
5 | CFLAGS=@CFLAGS@ @DEFS@ -Dlibdir=\"$(libdir)\" -DPIDDIR=\"$(piddir)\" | |
6 | LIBS=@LIBS@ | |
6884be5b | 7 | OBJS=stunnel.o ssl.o client.o protocol.o sthreads.o pty.o log.o options.o |
c039e015 | 8 | -DESTFILES=$(sbindir)/stunnel $(libdir)/stunnel.so $(man8dir)/stunnel.8 $(PEM_DIR)/stunnel.pem |
6884be5b | 9 | +DESTFILES=$(DESTDIR)$(sbindir)/stunnel $(DESTDIR)$(libdir)/stunnel.so $(DESTDIR)$(man8dir)/stunnel.8 $(DESTDIR)$(PEM_DIR)/stunnel.pem |
c039e015 | 10 | |
6884be5b | 11 | WINGCC=i386-mingw32msvc-gcc |
12 | WINCFLAGS=-O2 -Wall -DUSE_WIN32 -DHAVE_OPENSSL -DVERSION=\"@VERSION@\" -I../openssl-0.9.6/outinc | |
13 | @@ -56,8 +56,8 @@ | |
14 | gpg --yes --armor --detach-sign --force-v3-sigs ../dist/$(VERSION).tar.gz | |
c039e015 | 15 | |
16 | installdirs: mkinstalldirs | |
17 | - ./mkinstalldirs $(sbindir) $(libdir) $(man8dir) $(PEM_DIR) $(piddir) | |
18 | - chmod a=rwx,+t $(piddir) | |
19 | + ./mkinstalldirs $(DESTDIR)$(sbindir) $(DESTDIR)$(libdir) $(DESTDIR)$(man8dir) $(DESTDIR)$(PEM_DIR) $(DESTDIR)$(piddir) | |
20 | + chmod a=rwx,+t $(DESTDIR)$(piddir) | |
21 | ||
22 | # non-standard external rules | |
23 | ||
6884be5b | 24 | @@ -100,17 +100,17 @@ |
c039e015 | 25 | -in stunnel.pem |
26 | ||
a6100106 | 27 | -$(sbindir)/stunnel: stunnel |
c039e015 | 28 | - $(INSTALL) -m 711 stunnel $(sbindir) |
a6100106 | 29 | +$(DESTDIR)$(sbindir)/stunnel: stunnel |
c039e015 | 30 | + $(INSTALL) -m 711 stunnel $(DESTDIR)$(sbindir) |
31 | ||
a6100106 | 32 | -$(libdir)/stunnel.so: stunnel.so |
c039e015 | 33 | - test -s stunnel.so && $(INSTALL) -m 755 stunnel.so $(libdir) |
a6100106 | 34 | +$(DESTDIR)$(libdir)/stunnel.so: stunnel.so |
c039e015 | 35 | + test -s stunnel.so && $(INSTALL) -m 755 stunnel.so $(DESTDIR)$(libdir) |
36 | ||
a6100106 | 37 | -$(man8dir)/stunnel.8: stunnel.8 |
c039e015 | 38 | - $(INSTALL) -m 644 stunnel.8 $(man8dir) |
a6100106 | 39 | +$(DESTDIR)$(man8dir)/stunnel.8: stunnel.8 |
c039e015 | 40 | + $(INSTALL) -m 644 stunnel.8 $(DESTDIR)$(man8dir) |
41 | ||
a6100106 JB |
42 | -$(PEM_DIR)/stunnel.pem: stunnel.pem |
43 | +$(DESTDIR)$(PEM_DIR)/stunnel.pem: stunnel.pem | |
c039e015 | 44 | if [ -n "$(PEM_DIR)" ] ; then \ |
45 | - $(INSTALL) -m 600 stunnel.pem $(PEM_DIR); \ | |
46 | + $(INSTALL) -m 600 stunnel.pem $(DESTDIR)$(PEM_DIR); \ | |
47 | fi | |
48 | ||
49 | ../dist/$(VERSION).exe: stunnel.exe |