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
228228 ifndef CONFIG_WIN32
229229 install: $(PROGS) $(TCCLIBS) $(TCCDOCS)
230230 mkdir -p "$(bindir)"
231+ifeq ($(CC),tcc)
232+ $(INSTALL) -m755 $(PROGS) "$(bindir)"
233+else
231234 $(INSTALL) -s -m755 $(PROGS) "$(bindir)"
235+endif
232236 mkdir -p "$(mandir)/man1"
233237 -$(INSTALL) tcc.1 "$(mandir)/man1"
234238 mkdir -p "$(infodir)"
@@ -258,7 +262,7 @@ ifdef CONFIG_CROSS · 23 unmodified lines
258262 ifeq ($(ARCH),x86-64)
259263 mkdir -p "$(tccdir)/i386"
260264 $(INSTALL) -m644 lib/i386/libtcc1.a "$(tccdir)/i386"
261− ln -sf "$(tccdir)/include" "$(tccdir)/i386"
265+ cp -r "$(tccdir)/include" "$(tccdir)/i386"
262266 endif
263267 $(INSTALL) -m644 win32/lib/*.def "$(tccdir)/win32/lib"
264268 $(INSTALL) -m644 lib/i386-win32/libtcc1.a "$(tccdir)/win32/lib/32"
@@ -275,6 +279,7 @@ uninstall: · 10 unmodified lines
275279 rm -fv "$(libdir)/$(LIBTCC)" "$(includedir)/libtcc.h"
276280 rm -fv "$(libdir)/libtcc.so*"
277281 rm -rf "$(tccdir)/win32"
282+ -rmdir $(tccdir)/include
278283 ifeq ($(ARCH),x86-64)
279284 rm -rf "$(tccdir)/i386"
280285 endif