projects / packages / libwmf.git / blame
| Commit | Line | Data |
|---|---|---|
| 57b771da JB |
1 | diff -Nur libwmf.orig/Makefile.in libwmf/Makefile.in |
| 2 | --- libwmf.orig/Makefile.in Thu Dec 16 16:31:01 1999 | |
| 3 | +++ libwmf/Makefile.in Thu Dec 28 14:32:41 2000 | |
| 8e362127 | 4 | @@ -130,19 +130,19 @@ |
| 5 | @(cd libxfig && $(MAKE) realclean) || exit 1 | |
| 23b96819 JR |
6 | |
| 7 | installdirs: | |
| 8 | - $(MKINSTALLDIRS) $(bindir) \ | |
| 9 | - $(libdir) | |
| 10 | + $(MKINSTALLDIRS) $(DESTDIR)$(bindir) \ | |
| 11 | + $(DESTDIR)$(libdir) | |
| 12 | ||
| 13 | install: all installdirs installsub | |
| 14 | - $(INSTALL) $(srcdir)/xwmf $(bindir)/xwmf | |
| 8e362127 | 15 | - $(INSTALL) $(srcdir)/wmftopng $(bindir)/wmftopng |
| 16 | - $(INSTALL) $(srcdir)/wmftofig $(bindir)/wmftofig | |
| 23b96819 JR |
17 | - $(INSTALL_DATA) $(srcdir)/libwmf.a $(libdir)/libwmf.a |
| 18 | - $(INSTALL_DATA) $(srcdir)/libgdwmf.a $(libdir)/libgdwmf.a | |
| 19 | - $(INSTALL_DATA) $(srcdir)/libXwmf.a $(libdir)/libXwmf.a | |
| 8e362127 | 20 | - $(INSTALL_DATA) $(srcdir)/libxfwmf.a $(libdir)/libxfwmf.a |
| 23b96819 JR |
21 | - $(INSTALL_DATA) wmfapi.h $(INCLUDEDIR)/wmfapi.h |
| 22 | - $(INSTALL_DATA) gdwmfapi.h $(INCLUDEDIR)/gdwmfapi.h | |
| 23 | - $(INSTALL_DATA) Xwmfapi.h $(INCLUDEDIR)/Xwmfapi.h | |
| 24 | + $(INSTALL) $(srcdir)/xwmf $(DESTDIR)$(bindir)/xwmf | |
| 8e362127 | 25 | + $(INSTALL) $(srcdir)/wmftopng $(DESTDIR)$(bindir)/wmftopng |
| 26 | + $(INSTALL) $(srcdir)/wmftofig $(DESTDIR)$(bindir)/wmftofig | |
| 23b96819 JR |
27 | + $(INSTALL_DATA) $(srcdir)/libwmf.a $(DESTDIR)$(libdir)/libwmf.a |
| 28 | + $(INSTALL_DATA) $(srcdir)/libgdwmf.a $(DESTDIR)$(libdir)/libgdwmf.a | |
| 29 | + $(INSTALL_DATA) $(srcdir)/libXwmf.a $(DESTDIR)$(libdir)/libXwmf.a | |
| 8e362127 | 30 | + $(INSTALL_DATA) $(srcdir)/libxfwmf.a $(DESTDIR)$(libdir)/libxfwmf.a |
| 23b96819 JR |
31 | + $(INSTALL_DATA) wmfapi.h $(DESTDIR)$(INCLUDEDIR)/wmfapi.h |
| 32 | + $(INSTALL_DATA) gdwmfapi.h $(DESTDIR)$(INCLUDEDIR)/gdwmfapi.h | |
| 33 | + $(INSTALL_DATA) Xwmfapi.h $(DESTDIR)$(INCLUDEDIR)/Xwmfapi.h | |
| 34 | ||
| 35 | # DO NOT DELETE THIS LINE -- make depend depends on it. | |
| 57b771da JB |
36 | diff -Nur libwmf.orig/libdib/Makefile.in libwmf/libdib/Makefile.in |
| 37 | --- libwmf.orig/libdib/Makefile.in Tue Jul 13 15:14:28 1999 | |
| 38 | +++ libwmf/libdib/Makefile.in Thu Dec 28 14:35:01 2000 | |
| 23b96819 JR |
39 | @@ -54,12 +54,12 @@ |
| 40 | rm -rf config.cache config.status config.log Makefile config.h lex.yy.c *.o *.a test_dibtoxpm core | |
| 41 | ||
| 42 | installdirs: | |
| 43 | - $(MKINSTALLDIRS) @libdir@ \ | |
| 44 | - $(INCLUDEDIR) | |
| 45 | + $(MKINSTALLDIRS) $(DESTDIR)@libdir@ \ | |
| 46 | + $(DESTDIR)$(INCLUDEDIR) | |
| 47 | ||
| 48 | install: all installdirs | |
| 49 | - $(INSTALL_DATA) dibtoxpm.h $(INCLUDEDIR)/dibtoxpm.h | |
| 50 | - $(INSTALL_DATA) libdib.a @libdir@/libdib.a | |
| 51 | + $(INSTALL_DATA) dibtoxpm.h $(DESTDIR)$(INCLUDEDIR)/dibtoxpm.h | |
| 52 | + $(INSTALL_DATA) libdib.a $(DESTDIR)@libdir@/libdib.a | |
| 53 | ||
| 54 | ||
| 55 | # DO NOT DELETE THIS LINE -- make depend depends on it. | |
| 57b771da JB |
56 | diff -Nur libwmf.orig/libsvg/Makefile.in libwmf/libsvg/Makefile.in |
| 57 | --- libwmf.orig/libsvg/Makefile.in Thu Dec 9 14:07:57 1999 | |
| 58 | +++ libwmf/libsvg/Makefile.in Thu Dec 28 14:35:49 2000 | |
| 8e362127 | 59 | @@ -51,11 +51,11 @@ |
| 60 | rm -rf config.cache config.status config.log Makefile config.h lex.yy.c *.o *.a core | |
| 61 | ||
| 62 | install: all installdirs | |
| 63 | - $(INSTALL_DATA) libsvg.a @libdir@/libsvg.a | |
| 64 | + $(INSTALL_DATA) libsvg.a $(DESTDIR)@libdir@/libsvg.a | |
| 23b96819 JR |
65 | |
| 66 | installdirs: | |
| 67 | - $(MKINSTALLDIRS) @libdir@ \ | |
| 68 | - $(INCLUDEDIR) | |
| 69 | + $(MKINSTALLDIRS) $(DESTDIR)@libdir@ \ | |
| 70 | + $(DESTDIR)$(INCLUDEDIR) | |
| 71 | ||
| 8e362127 | 72 | |
| 73 | # DO NOT DELETE THIS LINE -- make depend depends on it. | |
| 57b771da JB |
74 | diff -Nur libwmf.orig/libxfig/Makefile.in libwmf/libxfig/Makefile.in |
| 75 | --- libwmf.orig/libxfig/Makefile.in Tue Jul 13 15:16:20 1999 | |
| 76 | +++ libwmf/libxfig/Makefile.in Thu Dec 28 14:36:37 2000 | |
| 8e362127 | 77 | @@ -51,11 +51,11 @@ |
| 78 | rm -rf config.cache config.status config.log Makefile config.h lex.yy.c *.o *.a core | |
| 79 | ||
| 23b96819 | 80 | install: all installdirs |
| 8e362127 | 81 | - $(INSTALL_DATA) libxfig.a @libdir@/libxfig.a |
| 82 | + $(INSTALL_DATA) libxfig.a $(DESTDIR)@libdir@/libxfig.a | |
| 83 | ||
| 84 | installdirs: | |
| 85 | - $(MKINSTALLDIRS) @libdir@ \ | |
| 86 | - $(INCLUDEDIR) | |
| 87 | + $(MKINSTALLDIRS) $(DESTDIR)@libdir@ \ | |
| 88 | + $(DESTDIR)$(INCLUDEDIR) | |
| 89 | ||
| 90 | ||
| 91 | # DO NOT DELETE THIS LINE -- make depend depends on it. | |
| 57b771da JB |
92 | diff -Nur libwmf.orig/xgd-1.7.3/Makefile.in libwmf/xgd-1.7.3/Makefile.in |
| 93 | --- libwmf.orig/xgd-1.7.3/Makefile.in Thu Dec 16 16:31:47 1999 | |
| 94 | +++ libwmf/xgd-1.7.3/Makefile.in Thu Dec 28 14:38:50 2000 | |
| 95 | @@ -56,13 +56,13 @@ | |
| 96 | LIBDIRS=-L. | |
| 97 | ||
| 98 | #Location where libxgd.a should be installed by "make install". | |
| 99 | -INSTALL_LIB=@libdir@ | |
| 100 | +INSTALL_LIB=$(DESTDIR)@libdir@ | |
| 101 | ||
| 102 | #Location where .h files should be installed by "make install". | |
| 103 | -INSTALL_INCLUDE=@includedir@ | |
| 104 | +INSTALL_INCLUDE=$(DESTDIR)@includedir@ | |
| 105 | ||
| 106 | #Location where useful non-test programs should be installed by "make install". | |
| 107 | -INSTALL_BIN=@bindir@ | |
| 108 | +INSTALL_BIN=$(DESTDIR)@bindir@ | |
| 109 | ||
| 110 | # | |
| 111 | # |