wok-next diff tcc/stuff/Makefile.u @ rev 14344
tcc: update patch
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Sun Apr 14 14:51:53 2013 +0200 (2013-04-14) |
| parents | cb3974d9da27 |
| children |
line diff
1.1 --- a/tcc/stuff/Makefile.u Fri Sep 25 09:09:41 2009 +0200 1.2 +++ b/tcc/stuff/Makefile.u Sun Apr 14 14:51:53 2013 +0200 1.3 @@ -1,84 +1,142 @@ 1.4 ---- tcc-0.9.25/Makefile 1.5 -+++ tcc-0.9.25/Makefile 1.6 -@@ -197,48 +197,48 @@ 1.7 +--- tcc-0.9.26/Makefile 1.8 ++++ tcc-0.9.26/Makefile 1.9 +@@ -218,84 +218,84 @@ 1.10 1.11 ifndef CONFIG_WIN32 1.12 - install: $(PROGS) $(LIBTCC1) $(BCHECK_O) libtcc.a tcc.1 tcc-doc.html 1.13 + install: $(PROGS) $(TCCLIBS) $(TCCDOCS) 1.14 - mkdir -p "$(bindir)" 1.15 -- $(INSTALL) -s -m755 $(PROGS) "$(bindir)" 1.16 ++ mkdir -p "$(DESTDIR)/$(bindir)" 1.17 + ifeq ($(CC),tcc) 1.18 +- $(INSTALL) -m755 $(PROGS) "$(bindir)" 1.19 ++ $(INSTALL) -m755 $(PROGS) "$(DESTDIR)/$(bindir)" 1.20 + else 1.21 +- $(INSTALLBIN) -m755 $(PROGS) "$(bindir)" 1.22 ++ $(INSTALLBIN) -m755 $(PROGS) "$(DESTDIR)/$(bindir)" 1.23 + endif 1.24 - mkdir -p "$(mandir)/man1" 1.25 -- $(INSTALL) tcc.1 "$(mandir)/man1" 1.26 +- -$(INSTALL) tcc.1 "$(mandir)/man1" 1.27 +- mkdir -p "$(infodir)" 1.28 +- -$(INSTALL) tcc-doc.info "$(infodir)" 1.29 - mkdir -p "$(tccdir)" 1.30 - mkdir -p "$(tccdir)/include" 1.31 -+ mkdir -p "$(DESTDIR)/$(bindir)" 1.32 -+ $(INSTALL) -s -m755 $(PROGS) "$(DESTDIR)/$(bindir)" 1.33 + mkdir -p "$(DESTDIR)/$(mandir)/man1" 1.34 -+ $(INSTALL) tcc.1 "$(DESTDIR)/$(mandir)/man1" 1.35 ++ -$(INSTALL) tcc.1 "$(DESTDIR)/$(mandir)/man1" 1.36 ++ mkdir -p "$(DESTDIR)/$(infodir)" 1.37 ++ -$(INSTALL) tcc-doc.info "$(DESTDIR)/$(infodir)" 1.38 + mkdir -p "$(DESTDIR)/$(tccdir)" 1.39 + mkdir -p "$(DESTDIR)/$(tccdir)/include" 1.40 ifneq ($(LIBTCC1),) 1.41 - $(INSTALL) -m644 $(LIBTCC1) "$(tccdir)" 1.42 + $(INSTALL) -m644 $(LIBTCC1) "$(DESTDIR)/$(tccdir)" 1.43 endif 1.44 - ifneq ($(BCHECK_O),) 1.45 -- $(INSTALL) -m644 $(BCHECK_O) "$(tccdir)" 1.46 -+ $(INSTALL) -m644 $(BCHECK_O) "$(DESTDIR)/$(tccdir)" 1.47 +- $(INSTALL) -m644 $(addprefix $(top_srcdir)/include/,$(TCC_INCLUDES)) "$(tccdir)/include" 1.48 ++ $(INSTALL) -m644 $(addprefix $(top_srcdir)/include/,$(TCC_INCLUDES)) "$(DESTDIR)/$(tccdir)/include" 1.49 + mkdir -p "$(libdir)" 1.50 +- $(INSTALL) -m755 $(LIBTCC) "$(libdir)" 1.51 ++ $(INSTALL) -m755 $(LIBTCC) "$(DESTDIR)/$(libdir)" 1.52 + ifdef DISABLE_STATIC 1.53 +- ln -sf "$(ln_libdir)/libtcc.so.1.0" "$(libdir)/libtcc.so.1" 1.54 +- ln -sf "$(ln_libdir)/libtcc.so.1.0" "$(libdir)/libtcc.so" 1.55 ++ ln -sf "$(ln_libdir)/libtcc.so.1.0" "$(DESTDIR)/$(libdir)/libtcc.so.1" 1.56 ++ ln -sf "$(ln_libdir)/libtcc.so.1.0" "$(DESTDIR)/$(libdir)/libtcc.so" 1.57 endif 1.58 -- $(INSTALL) -m644 $(addprefix include/,$(TCC_INCLUDES)) "$(tccdir)/include" 1.59 +- mkdir -p "$(includedir)" 1.60 +- $(INSTALL) -m644 $(top_srcdir)/libtcc.h "$(includedir)" 1.61 - mkdir -p "$(docdir)" 1.62 -- $(INSTALL) -m644 tcc-doc.html "$(docdir)" 1.63 -- mkdir -p "$(libdir)" 1.64 -- $(INSTALL) -m644 libtcc.a "$(libdir)" 1.65 -- mkdir -p "$(includedir)" 1.66 -- $(INSTALL) -m644 libtcc.h "$(includedir)" 1.67 -+ $(INSTALL) -m644 $(addprefix include/,$(TCC_INCLUDES)) "$(DESTDIR)/$(tccdir)/include" 1.68 +- -$(INSTALL) -m644 tcc-doc.html "$(docdir)" 1.69 ++ mkdir -p "$(DESTDIR)/$(includedir)" 1.70 ++ $(INSTALL) -m644 $(top_srcdir)/libtcc.h "$(DESTDIR)/$(includedir)" 1.71 + mkdir -p "$(DESTDIR)/$(docdir)" 1.72 -+ $(INSTALL) -m644 tcc-doc.html "$(DESTDIR)/$(docdir)" 1.73 -+ mkdir -p "$(DESTDIR)/$(libdir)" 1.74 -+ $(INSTALL) -m644 libtcc.a "$(DESTDIR)/$(libdir)" 1.75 -+ mkdir -p "$(DESTDIR)/$(includedir)" 1.76 -+ $(INSTALL) -m644 libtcc.h "$(DESTDIR)/$(includedir)" 1.77 ++ -$(INSTALL) -m644 tcc-doc.html "$(DESTDIR)/$(docdir)" 1.78 + ifdef CONFIG_CROSS 1.79 +- mkdir -p "$(tccdir)/win32/lib/32" 1.80 +- mkdir -p "$(tccdir)/win32/lib/64" 1.81 ++ mkdir -p "$(DESTDIR)/$(tccdir)/win32/lib/32" 1.82 ++ mkdir -p "$(DESTDIR)/$(tccdir)/win32/lib/64" 1.83 + ifeq ($(ARCH),x86-64) 1.84 +- mkdir -p "$(tccdir)/i386" 1.85 +- $(INSTALL) -m644 lib/i386/libtcc1.a "$(tccdir)/i386" 1.86 +- cp -r "$(tccdir)/include" "$(tccdir)/i386" 1.87 ++ mkdir -p "$(DESTDIR)/$(tccdir)/i386" 1.88 ++ $(INSTALL) -m644 lib/i386/libtcc1.a "$(DESTDIR)/$(tccdir)/i386" 1.89 ++ cp -r "$(tccdir)/include" "$(DESTDIR)/$(tccdir)/i386" 1.90 + endif 1.91 +- $(INSTALL) -m644 win32/lib/*.def "$(tccdir)/win32/lib" 1.92 +- $(INSTALL) -m644 lib/i386-win32/libtcc1.a "$(tccdir)/win32/lib/32" 1.93 +- $(INSTALL) -m644 lib/x86_64-win32/libtcc1.a "$(tccdir)/win32/lib/64" 1.94 +- cp -r win32/include/. "$(tccdir)/win32/include" 1.95 +- cp -r include/. "$(tccdir)/win32/include" 1.96 ++ $(INSTALL) -m644 win32/lib/*.def "$(DESTDIR)/$(tccdir)/win32/lib" 1.97 ++ $(INSTALL) -m644 lib/i386-win32/libtcc1.a "$(DESTDIR)/$(tccdir)/win32/lib/32" 1.98 ++ $(INSTALL) -m644 lib/x86_64-win32/libtcc1.a "$(DESTDIR)/$(tccdir)/win32/lib/64" 1.99 ++ cp -r win32/include/. "$(DESTDIR)/$(tccdir)/win32/include" 1.100 ++ cp -r include/. "$(DESTDIR)/$(tccdir)/win32/include" 1.101 + endif 1.102 1.103 uninstall: 1.104 - rm -fv $(foreach P,$(PROGS),"$(bindir)/$P") 1.105 -- rm -fv $(foreach P,$(LIBTCC1) $(BCHECK_O),"$(tccdir)/$P") 1.106 +- rm -fv $(foreach P,$(LIBTCC1),"$(tccdir)/$P") 1.107 - rm -fv $(foreach P,$(TCC_INCLUDES),"$(tccdir)/include/$P") 1.108 -- rm -fv "$(docdir)/tcc-doc.html" "$(mandir)/man1/tcc.1" 1.109 -- rm -fv "$(libdir)/libtcc.a" "$(includedir)/libtcc.h" 1.110 +- rm -fv "$(docdir)/tcc-doc.html" "$(mandir)/man1/tcc.1" "$(infodir)/tcc-doc.info" 1.111 +- rm -fv "$(libdir)/$(LIBTCC)" "$(includedir)/libtcc.h" 1.112 +- rm -fv "$(libdir)/libtcc.so*" 1.113 +- rm -rf "$(tccdir)/win32" 1.114 +- -rmdir $(tccdir)/include 1.115 + rm -fv $(foreach P,$(PROGS),"$(DESTDIR)/$(bindir)/$P") 1.116 -+ rm -fv $(foreach P,$(LIBTCC1) $(BCHECK_O),"$(DESTDIR)/$(tccdir)/$P") 1.117 ++ rm -fv $(foreach P,$(LIBTCC1),"$(DESTDIR)/$(tccdir)/$P") 1.118 + rm -fv $(foreach P,$(TCC_INCLUDES),"$(DESTDIR)/$(tccdir)/include/$P") 1.119 -+ rm -fv "$(docdir)/tcc-doc.html" "$(DESTDIR)/$(mandir)/man1/tcc.1" 1.120 -+ rm -fv "$(libdir)/libtcc.a" "$(DESTDIR)/$(includedir)/libtcc.h" 1.121 - 1.122 ++ rm -fv "$(DESTDIR)/$(docdir)/tcc-doc.html" "$(DESTDIR)/$(mandir)/man1/tcc.1" "$(DESTDIR)/$(infodir)/tcc-doc.info" 1.123 ++ rm -fv "$(DESTDIR)/$(libdir)/$(LIBTCC)" "$(DESTDIR)/$(includedir)/libtcc.h" 1.124 ++ rm -fv "$(DESTDIR)/$(libdir)/libtcc.so*" 1.125 ++ rm -rf "$(DESTDIR)/$(tccdir)/win32" 1.126 ++ -rmdir $(DESTDIR)/$(tccdir)/include 1.127 + ifeq ($(ARCH),x86-64) 1.128 +- rm -rf "$(tccdir)/i386" 1.129 ++ rm -rf "$(DESTDIR)/$(tccdir)/i386" 1.130 + endif 1.131 else 1.132 - install: $(PROGS) $(LIBTCC1) libtcc.a tcc-doc.html 1.133 + # on windows 1.134 + install: $(PROGS) $(TCCLIBS) $(TCCDOCS) 1.135 - mkdir -p "$(tccdir)" 1.136 - mkdir -p "$(tccdir)/lib" 1.137 - mkdir -p "$(tccdir)/include" 1.138 - mkdir -p "$(tccdir)/examples" 1.139 - mkdir -p "$(tccdir)/doc" 1.140 - mkdir -p "$(tccdir)/libtcc" 1.141 -- $(INSTALL) -s -m755 $(PROGS) "$(tccdir)" 1.142 +- $(INSTALLBIN) -m755 $(PROGS) "$(tccdir)" 1.143 - $(INSTALL) -m644 $(LIBTCC1) win32/lib/*.def "$(tccdir)/lib" 1.144 - cp -r win32/include/. "$(tccdir)/include" 1.145 - cp -r win32/examples/. "$(tccdir)/examples" 1.146 --# $(INSTALL) -m644 $(addprefix include/,$(TCC_INCLUDES)) "$(tccdir)/include" 1.147 +- $(INSTALL) -m644 $(addprefix include/,$(TCC_INCLUDES)) "$(tccdir)/include" 1.148 - $(INSTALL) -m644 tcc-doc.html win32/tcc-win32.txt "$(tccdir)/doc" 1.149 -- $(INSTALL) -m644 libtcc.a libtcc.h "$(tccdir)/libtcc" 1.150 +- $(INSTALL) -m644 $(LIBTCC) libtcc.h "$(tccdir)/libtcc" 1.151 + mkdir -p "$(DESTDIR)/$(tccdir)" 1.152 + mkdir -p "$(DESTDIR)/$(tccdir)/lib" 1.153 + mkdir -p "$(DESTDIR)/$(tccdir)/include" 1.154 + mkdir -p "$(DESTDIR)/$(tccdir)/examples" 1.155 + mkdir -p "$(DESTDIR)/$(tccdir)/doc" 1.156 + mkdir -p "$(DESTDIR)/$(tccdir)/libtcc" 1.157 -+ $(INSTALL) -s -m755 $(PROGS) "$(DESTDIR)/$(tccdir)" 1.158 ++ $(INSTALLBIN) -m755 $(PROGS) "$(DESTDIR)/$(tccdir)" 1.159 + $(INSTALL) -m644 $(LIBTCC1) win32/lib/*.def "$(DESTDIR)/$(tccdir)/lib" 1.160 + cp -r win32/include/. "$(DESTDIR)/$(tccdir)/include" 1.161 + cp -r win32/examples/. "$(DESTDIR)/$(tccdir)/examples" 1.162 -+# $(INSTALL) -m644 $(addprefix include/,$(TCC_INCLUDES)) "$(DESTDIR)/$(tccdir)/include" 1.163 ++ $(INSTALL) -m644 $(addprefix include/,$(TCC_INCLUDES)) "$(DESTDIR)/$(tccdir)/include" 1.164 + $(INSTALL) -m644 tcc-doc.html win32/tcc-win32.txt "$(DESTDIR)/$(tccdir)/doc" 1.165 -+ $(INSTALL) -m644 libtcc.a libtcc.h "$(DESTDIR)/$(tccdir)/libtcc" 1.166 ++ $(INSTALL) -m644 $(LIBTCC) libtcc.h "$(DESTDIR)/$(tccdir)/libtcc" 1.167 + ifdef CONFIG_CROSS 1.168 +- mkdir -p "$(tccdir)/lib/32" 1.169 +- mkdir -p "$(tccdir)/lib/64" 1.170 +- -$(INSTALL) -m644 lib/i386-win32/libtcc1.a "$(tccdir)/lib/32" 1.171 +- -$(INSTALL) -m644 lib/x86_64-win32/libtcc1.a "$(tccdir)/lib/64" 1.172 ++ mkdir -p "$(DESTDIR)/$(tccdir)/lib/32" 1.173 ++ mkdir -p "$(DESTDIR)/$(tccdir)/lib/64" 1.174 ++ -$(INSTALL) -m644 lib/i386-win32/libtcc1.a "$(DESTDIR)/$(tccdir)/lib/32" 1.175 ++ -$(INSTALL) -m644 lib/x86_64-win32/libtcc1.a "$(DESTDIR)/$(tccdir)/lib/64" 1.176 + endif 1.177 + 1.178 + uninstall: 1.179 +- rm -rfv "$(tccdir)/*" 1.180 ++ rm -rfv "$(DESTDIR)/$(tccdir)/*" 1.181 endif 1.182 1.183 # documentation and man page