]>
Commit | Line | Data |
---|---|---|
eb2bd0c9 ER |
1 | --- ming-0.3.0/Makefile-real~ 2006-01-30 16:53:39.000000000 +0200 |
2 | +++ ming-0.3.0/Makefile-real 2007-02-09 18:49:26.761167908 +0200 | |
3 | @@ -7,36 +7,36 @@ | |
4 | install: install-common install-dynamic install-utils install-static install-man | |
5 | ||
6 | install-common: | |
7 | - install -d $(libdir) | |
8 | - install -d $(includedir) | |
9 | - install -c -m 0644 src/ming.h $(includedir) | |
10 | - install -c -m 0644 src/ming_config.h $(includedir) | |
11 | - install -c -m 0644 mingpp.h $(includedir) | |
12 | + install -d $(DESTDIR)$(libdir) | |
13 | + install -d $(DESTDIR)$(includedir) | |
14 | + install -c -m 0644 src/ming.h $(DESTDIR)$(includedir) | |
15 | + install -c -m 0644 src/ming_config.h $(DESTDIR)$(includedir) | |
16 | + install -c -m 0644 mingpp.h $(DESTDIR)$(includedir) | |
17 | ||
18 | install-utils: | |
19 | - (cd util && make install) | |
20 | + $(MAKE) -C util install | |
21 | ||
22 | install-man: | |
23 | - (cd man && make install) | |
24 | + $(MAKE) -C man install | |
25 | ||
26 | install-dynamic: dynamic | |
27 | - install -c -m 0644 $(SHAREDLIB) $(libdir)/$(SHAREDLIB) | |
28 | - (cd $(libdir) && ln -fs $(SHAREDLIB) libming$(SHORT_SHLIBEXT) && ln -fs libming$(SHORT_SHLIBEXT) libming$(NOVAR_SHLIBEXT)) | |
29 | + install -c -m 0644 $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SHAREDLIB) | |
30 | + (cd $(DESTDIR)$(libdir) && ln -fs $(SHAREDLIB) libming$(SHORT_SHLIBEXT) && ln -fs libming$(SHORT_SHLIBEXT) libming$(NOVAR_SHLIBEXT)) | |
31 | ||
32 | install-static: static | |
33 | - install -c -m 0644 libming.a $(libdir)/ | |
34 | + install -c -m 0644 libming.a $(DESTDIR)$(libdir)/ | |
35 | ||
36 | utils: | |
37 | - (cd util && make) | |
38 | + $(MAKE) -C util | |
39 | ||
40 | dynamic: | |
41 | - (cd src && $(MAKE) $@ CFLAGS="$(CFLAGS) $(SHCFLAGS)") | |
42 | + $(MAKE) -C src $@ CFLAGS="$(CFLAGS) $(SHCFLAGS)" | |
43 | ||
44 | static: | |
45 | - (cd src && $(MAKE) $@) | |
46 | + $(MAKE) -C src $@ | |
47 | ||
48 | clean: | |
49 | - for i in $(DIRS); do (cd $$i && $(MAKE) clean); done | |
50 | + for i in $(DIRS); do $(MAKE) -C $$i clean; done | |
51 | if [ -f perl_ext/Makefile ] ; then cd perl_ext; $(MAKE) clean; fi | |
52 | rm -f test.o test test.exe *.core *~ | |
53 | rm -f libming.a libming*$(NOVAR_SHLIBEXT)* | |
54 | --- ming-0.3.0/util/Makefile~ 2006-01-30 16:52:48.000000000 +0200 | |
55 | +++ ming-0.3.0/util/Makefile 2007-02-09 18:50:48.593023046 +0200 | |
56 | @@ -79,6 +79,6 @@ | |
57 | $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< | |
58 | ||
59 | install: $(BINARIES) | |
60 | - install -d $(bindir) | |
61 | - install -m 0755 $(BINARIES) $(bindir) | |
62 | - install -m 0755 ming-config $(bindir) | |
63 | + install -d $(DESTDIR)$(bindir) | |
64 | + install -m 0755 $(BINARIES) $(DESTDIR)$(bindir) | |
65 | + install -m 0755 ming-config $(DESTDIR)$(bindir) | |
66 | --- ming-0.3.0/man/Makefile~ 2005-03-28 01:06:17.000000000 +0300 | |
67 | +++ ming-0.3.0/man/Makefile 2007-02-09 18:52:22.205144951 +0200 | |
68 | @@ -3,5 +3,5 @@ | |
69 | MAN1=makeswf.1 | |
70 | ||
71 | install: $(BINARIES) | |
72 | - install -d $(mandir)/man1 | |
73 | - install -m 0644 $(MAN1) $(mandir)/man1 | |
74 | + install -d $(DESTDIR)$(mandir)/man1 | |
75 | + install -m 0644 $(MAN1) $(DESTDIR)$(mandir)/man1 |