History

make: fix install with CC=tcc and potential link problem

Henry Kroll III committed 15 years ago

Commit 73cb4391 parent 90355c71 file · +6 −1Browse files

Unified · Split

Makefile+6−1
@@ -228,7 +228,11 @@ INSTALL=install · 227 unmodified lines
228ifndef CONFIG_WIN32228ifndef CONFIG_WIN32
229install: $(PROGS) $(TCCLIBS) $(TCCDOCS)229install: $(PROGS) $(TCCLIBS) $(TCCDOCS)
230 mkdir -p "$(bindir)"230 mkdir -p "$(bindir)"
231ifeq ($(CC),tcc)
232 $(INSTALL) -m755 $(PROGS) "$(bindir)"
233else
231 $(INSTALL) -s -m755 $(PROGS) "$(bindir)"234 $(INSTALL) -s -m755 $(PROGS) "$(bindir)"
235endif
232 mkdir -p "$(mandir)/man1"236 mkdir -p "$(mandir)/man1"
233 -$(INSTALL) tcc.1 "$(mandir)/man1"237 -$(INSTALL) tcc.1 "$(mandir)/man1"
234 mkdir -p "$(infodir)"238 mkdir -p "$(infodir)"
@@ -258,7 +262,7 @@ ifdef CONFIG_CROSS · 23 unmodified lines
258ifeq ($(ARCH),x86-64)262ifeq ($(ARCH),x86-64)
259 mkdir -p "$(tccdir)/i386"263 mkdir -p "$(tccdir)/i386"
260 $(INSTALL) -m644 lib/i386/libtcc1.a "$(tccdir)/i386"264 $(INSTALL) -m644 lib/i386/libtcc1.a "$(tccdir)/i386"
261 ln -sf "$(tccdir)/include" "$(tccdir)/i386"265 cp -r "$(tccdir)/include" "$(tccdir)/i386"
262endif266endif
263 $(INSTALL) -m644 win32/lib/*.def "$(tccdir)/win32/lib"267 $(INSTALL) -m644 win32/lib/*.def "$(tccdir)/win32/lib"
264 $(INSTALL) -m644 lib/i386-win32/libtcc1.a "$(tccdir)/win32/lib/32"268 $(INSTALL) -m644 lib/i386-win32/libtcc1.a "$(tccdir)/win32/lib/32"
@@ -275,6 +279,7 @@ uninstall: · 10 unmodified lines
275 rm -fv "$(libdir)/$(LIBTCC)" "$(includedir)/libtcc.h"279 rm -fv "$(libdir)/$(LIBTCC)" "$(includedir)/libtcc.h"
276 rm -fv "$(libdir)/libtcc.so*"280 rm -fv "$(libdir)/libtcc.so*"
277 rm -rf "$(tccdir)/win32"281 rm -rf "$(tccdir)/win32"
282 -rmdir $(tccdir)/include
278ifeq ($(ARCH),x86-64)283ifeq ($(ARCH),x86-64)
279 rm -rf "$(tccdir)/i386"284 rm -rf "$(tccdir)/i386"
280endif285endif