wok diff tcc/stuff/Makefile.u @ rev 11245

Up: midori: (0.4.1)
author Alexander Medvedev <devl547@gmail.com>
date Mon Nov 07 09:42:39 2011 +0300 (2011-11-07)
parents 32953ef3a7c7
children 012b01cf2c1d
line diff
     1.1 --- a/tcc/stuff/Makefile.u	Sun May 11 11:36:09 2008 +0000
     1.2 +++ b/tcc/stuff/Makefile.u	Mon Nov 07 09:42:39 2011 +0300
     1.3 @@ -1,60 +1,84 @@
     1.4 ---- tcc-0.9.24/Makefile
     1.5 -+++ tcc-0.9.24/Makefile
     1.6 -@@ -203,28 +203,28 @@
     1.7 - install: tcc_install libinstall
     1.8 +--- tcc-0.9.25/Makefile
     1.9 ++++ tcc-0.9.25/Makefile
    1.10 +@@ -197,48 +197,48 @@
    1.11   
    1.12 - tcc_install: $(PROGS) tcc.1 libtcc1.a $(BCHECK_O) tcc-doc.html
    1.13 + ifndef CONFIG_WIN32
    1.14 + install: $(PROGS) $(LIBTCC1) $(BCHECK_O) libtcc.a tcc.1 tcc-doc.html
    1.15  -	mkdir -p "$(bindir)"
    1.16  -	$(INSTALL) -s -m755 $(PROGS) "$(bindir)"
    1.17 +-	mkdir -p "$(mandir)/man1"
    1.18 +-	$(INSTALL) tcc.1 "$(mandir)/man1"
    1.19 +-	mkdir -p "$(tccdir)"
    1.20 +-	mkdir -p "$(tccdir)/include"
    1.21  +	mkdir -p "$(DESTDIR)/$(bindir)"
    1.22  +	$(INSTALL) -s -m755 $(PROGS) "$(DESTDIR)/$(bindir)"
    1.23 - ifndef CONFIG_WIN32
    1.24 --	mkdir -p "$(mandir)/man1"
    1.25 --	$(INSTALL) tcc.1 "$(mandir)/man1"
    1.26  +	mkdir -p "$(DESTDIR)/$(mandir)/man1"
    1.27  +	$(INSTALL) tcc.1 "$(DESTDIR)/$(mandir)/man1"
    1.28 - endif
    1.29 --	mkdir -p "$(tccdir)"
    1.30 --	mkdir -p "$(tccdir)/include"
    1.31  +	mkdir -p "$(DESTDIR)/$(tccdir)"
    1.32  +	mkdir -p "$(DESTDIR)/$(tccdir)/include"
    1.33 - ifdef CONFIG_WIN32
    1.34 + ifneq ($(LIBTCC1),)
    1.35 +-	$(INSTALL) -m644 $(LIBTCC1) "$(tccdir)"
    1.36 ++	$(INSTALL) -m644 $(LIBTCC1) "$(DESTDIR)/$(tccdir)"
    1.37 + endif
    1.38 + ifneq ($(BCHECK_O),)
    1.39 +-	$(INSTALL) -m644 $(BCHECK_O) "$(tccdir)"
    1.40 ++	$(INSTALL) -m644 $(BCHECK_O) "$(DESTDIR)/$(tccdir)"
    1.41 + endif
    1.42 +-	$(INSTALL) -m644 $(addprefix include/,$(TCC_INCLUDES)) "$(tccdir)/include"
    1.43 +-	mkdir -p "$(docdir)"
    1.44 +-	$(INSTALL) -m644 tcc-doc.html "$(docdir)"
    1.45 +-	mkdir -p "$(libdir)"
    1.46 +-	$(INSTALL) -m644 libtcc.a "$(libdir)"
    1.47 +-	mkdir -p "$(includedir)"
    1.48 +-	$(INSTALL) -m644 libtcc.h "$(includedir)"
    1.49 ++	$(INSTALL) -m644 $(addprefix include/,$(TCC_INCLUDES)) "$(DESTDIR)/$(tccdir)/include"
    1.50 ++	mkdir -p "$(DESTDIR)/$(docdir)"
    1.51 ++	$(INSTALL) -m644 tcc-doc.html "$(DESTDIR)/$(docdir)"
    1.52 ++	mkdir -p "$(DESTDIR)/$(libdir)"
    1.53 ++	$(INSTALL) -m644 libtcc.a "$(DESTDIR)/$(libdir)"
    1.54 ++	mkdir -p "$(DESTDIR)/$(includedir)"
    1.55 ++	$(INSTALL) -m644 libtcc.h "$(DESTDIR)/$(includedir)"
    1.56 + 
    1.57 + uninstall:
    1.58 +-	rm -fv $(foreach P,$(PROGS),"$(bindir)/$P")
    1.59 +-	rm -fv $(foreach P,$(LIBTCC1) $(BCHECK_O),"$(tccdir)/$P")
    1.60 +-	rm -fv $(foreach P,$(TCC_INCLUDES),"$(tccdir)/include/$P")
    1.61 +-	rm -fv "$(docdir)/tcc-doc.html" "$(mandir)/man1/tcc.1"
    1.62 +-	rm -fv "$(libdir)/libtcc.a" "$(includedir)/libtcc.h"
    1.63 ++	rm -fv $(foreach P,$(PROGS),"$(DESTDIR)/$(bindir)/$P")
    1.64 ++	rm -fv $(foreach P,$(LIBTCC1) $(BCHECK_O),"$(DESTDIR)/$(tccdir)/$P")
    1.65 ++	rm -fv $(foreach P,$(TCC_INCLUDES),"$(DESTDIR)/$(tccdir)/include/$P")
    1.66 ++	rm -fv "$(docdir)/tcc-doc.html" "$(DESTDIR)/$(mandir)/man1/tcc.1"
    1.67 ++	rm -fv "$(libdir)/libtcc.a" "$(DESTDIR)/$(includedir)/libtcc.h"
    1.68 + 
    1.69 + else
    1.70 + install: $(PROGS) $(LIBTCC1) libtcc.a tcc-doc.html
    1.71 +-	mkdir -p "$(tccdir)"
    1.72  -	mkdir -p "$(tccdir)/lib"
    1.73 --	$(INSTALL) -m644 libtcc1.a win32/lib/*.def "$(tccdir)/lib"
    1.74 +-	mkdir -p "$(tccdir)/include"
    1.75 +-	mkdir -p "$(tccdir)/examples"
    1.76 +-	mkdir -p "$(tccdir)/doc"
    1.77 +-	mkdir -p "$(tccdir)/libtcc"
    1.78 +-	$(INSTALL) -s -m755 $(PROGS) "$(tccdir)"
    1.79 +-	$(INSTALL) -m644 $(LIBTCC1) win32/lib/*.def "$(tccdir)/lib"
    1.80  -	cp -r win32/include/. "$(tccdir)/include"
    1.81  -	cp -r win32/examples/. "$(tccdir)/examples"
    1.82 +-#	$(INSTALL) -m644 $(addprefix include/,$(TCC_INCLUDES)) "$(tccdir)/include"
    1.83 +-	$(INSTALL) -m644 tcc-doc.html win32/tcc-win32.txt "$(tccdir)/doc"
    1.84 +-	$(INSTALL) -m644 libtcc.a libtcc.h "$(tccdir)/libtcc"
    1.85 ++	mkdir -p "$(DESTDIR)/$(tccdir)"
    1.86  +	mkdir -p "$(DESTDIR)/$(tccdir)/lib"
    1.87 -+	$(INSTALL) -m644 libtcc1.a win32/lib/*.def "$(DESTDIR)/$(tccdir)/lib"
    1.88 ++	mkdir -p "$(DESTDIR)/$(tccdir)/include"
    1.89 ++	mkdir -p "$(DESTDIR)/$(tccdir)/examples"
    1.90 ++	mkdir -p "$(DESTDIR)/$(tccdir)/doc"
    1.91 ++	mkdir -p "$(DESTDIR)/$(tccdir)/libtcc"
    1.92 ++	$(INSTALL) -s -m755 $(PROGS) "$(DESTDIR)/$(tccdir)"
    1.93 ++	$(INSTALL) -m644 $(LIBTCC1) win32/lib/*.def "$(DESTDIR)/$(tccdir)/lib"
    1.94  +	cp -r win32/include/. "$(DESTDIR)/$(tccdir)/include"
    1.95  +	cp -r win32/examples/. "$(DESTDIR)/$(tccdir)/examples"
    1.96 - else
    1.97 --	$(INSTALL) -m644 libtcc1.a $(BCHECK_O) "$(tccdir)"
    1.98 -+	$(INSTALL) -m644 libtcc1.a $(BCHECK_O) "$(DESTDIR)/$(tccdir)"
    1.99 - 	$(INSTALL) -m644 stdarg.h stddef.h stdbool.h float.h varargs.h \
   1.100 --                   tcclib.h "$(tccdir)/include"
   1.101 -+                   tcclib.h "$(DESTDIR)/$(tccdir)/include"
   1.102 - endif
   1.103 --	mkdir -p "$(docdir)"
   1.104 --	$(INSTALL) -m644 tcc-doc.html "$(docdir)"
   1.105 -+	mkdir -p "$(DESTDIR)/$(docdir)"
   1.106 -+	$(INSTALL) -m644 tcc-doc.html "$(DESTDIR)/$(docdir)"
   1.107 - ifdef CONFIG_WIN32
   1.108 --	$(INSTALL) -m644 win32/readme.txt "$(docdir)"
   1.109 -+	$(INSTALL) -m644 win32/readme.txt "$(DESTDIR)/$(docdir)"
   1.110 ++#	$(INSTALL) -m644 $(addprefix include/,$(TCC_INCLUDES)) "$(DESTDIR)/$(tccdir)/include"
   1.111 ++	$(INSTALL) -m644 tcc-doc.html win32/tcc-win32.txt "$(DESTDIR)/$(tccdir)/doc"
   1.112 ++	$(INSTALL) -m644 libtcc.a libtcc.h "$(DESTDIR)/$(tccdir)/libtcc"
   1.113   endif
   1.114   
   1.115 - clean:
   1.116 -@@ -242,10 +242,10 @@
   1.117 - 
   1.118 - # libtcc generation and example
   1.119 - libinstall: libtcc.a 
   1.120 --	mkdir -p "$(libdir)"
   1.121 --	$(INSTALL) -m644 libtcc.a "$(libdir)"
   1.122 -+	mkdir -p "$(DESTDIR)/$(libdir)"
   1.123 -+	$(INSTALL) -m644 libtcc.a "$(DESTDIR)/$(libdir)"
   1.124 - 	mkdir -p "$(includedir)"
   1.125 --	$(INSTALL) -m644 libtcc.h "$(includedir)"
   1.126 -+	$(INSTALL) -m644 libtcc.h "$(DESTDIR)/$(includedir)"
   1.127 - 
   1.128 - libtcc.o: tcc.c i386-gen.c Makefile
   1.129 - ifdef CONFIG_WIN32
   1.130 + # documentation and man page