Diff

Differences From Artifact [c5c37de162]:

To Artifact [3232e8d81e]:


    18     18   PACKAGE_NAME = @PACKAGE_NAME@
    19     19   PACKAGE_VERSION = @PACKAGE_VERSION@
    20     20   
    21     21   TCLCONFIGPATH = @TCLCONFIGPATH@
    22     22   TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@
    23     23   tcllibdir = $(shell if echo "$(libdir)" | grep '^UNSPECIFIED' >/dev/null; then echo $(TCL_PACKAGE_PATH); else echo "$(libdir)"; fi)
    24     24   PACKAGE_INSTALL_DIR = $(tcllibdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)
    25         -TCC_CONFIGURE_OPTS = --extra-cflags='$(CPPFLAGS) $(CFLAGS) -DCONFIG_TCC_STATIC=1' --with-tcl=$(TCLCONFIGPATH) --sysincludepaths='{B}/include:{B}/include/0:{B}/include/1:{B}/include/2' --libpaths='{B}/lib' @TCC_CONFIGURE_OPTS@
           25  +TCC_CONFIGURE_OPTS = --extra-cflags='$(CPPFLAGS) $(CFLAGS) -DCONFIG_TCC_STATIC=1' --with-tcl=$(TCLCONFIGPATH) --sysincludepaths='{B}/include:{B}/include/1:{B}/include/2:{B}/include/3:{B}/include/4:{B}/include/5:{B}/include/6:{B}/include/7:{B}/include/8:{B}/include/9' --libpaths='{B}/lib' @TCC_CONFIGURE_OPTS@
    26     26   INSTALL_HEADERS = tcl.h assert.h ctype.h errno.h float.h limits.h locale.h math.h setjmp.h signal.h stdarg.h stddef.h stdint.h stdio.h stdlib.h string.h time.h wctype.h
    27     27   srcdir = @srcdir@
    28     28   host_os = @host_os@
    29     29   @SET_MAKE@
    30     30   
    31     31   all: $(TARGET)
    32     32   
................................................................................
    69     69   	$(INSTALL) -m 0644 $(shell echo $(srcdir)/tcc/include/*) "$(DESTDIR)$(PACKAGE_INSTALL_DIR)/include"
    70     70   	@if ! echo "_WIN32" | $(CPP) $(CPPFLAGS) - | grep '^_WIN32$$' >/dev/null; then \
    71     71   		echo cp -r $(srcdir)/tcc/win32/include/* "$(DESTDIR)$(PACKAGE_INSTALL_DIR)/include/"; \
    72     72   		cp -r $(srcdir)/tcc/win32/include/* "$(DESTDIR)$(PACKAGE_INSTALL_DIR)/include/"; \
    73     73   		echo cp -r $(srcdir)/tcc/win32/lib/*.def "$(DESTDIR)$(PACKAGE_INSTALL_DIR)/lib/"; \
    74     74   		cp -r $(srcdir)/tcc/win32/lib/*.def "$(DESTDIR)$(PACKAGE_INSTALL_DIR)/lib/"; \
    75     75   	fi
    76         -	( \
    77         -		for file in $(INSTALL_HEADERS); do \
    78         -			echo "#include <$${file}>" |  $(CPP) $(CPPFLAGS) $(CFLAGS) -I$(srcdir)/tcc/include -I$(srcdir)/tcc/include - | awk -f $(srcdir)/headers.awk; \
    79         -		done \
    80         -	) | while read src dst; do \
    81         -		dst="$(DESTDIR)$(PACKAGE_INSTALL_DIR)/include/$$dst"; \
    82         -		if [ -e "$${dst}" ]; then continue; fi; \
    83         -		dstdir="$$(dirname "$$dst")"; \
    84         -		mkdir -p "$$dstdir"; \
    85         -		echo cp "$$src" "$$dst"; \
    86         -		cp "$$src" "$$dst"; \
    87         -	done
    88         -	( \
    89         -		cd $(DESTDIR)$(PACKAGE_INSTALL_DIR)/include/gcc || exit 0; \
    90         -		for file in *; do \
    91         -			if [ ! -e "../$${file}" ]; then \
    92         -				mv "$${file}" ../; \
    93         -			fi; \
    94         -		done \
    95         -	)
           76  +	( for file in $(INSTALL_HEADERS); do echo "#include <$${file}>"; done ) | \
           77  +		$(CPP) -v $(CPPFLAGS) $(CFLAGS) -I$(srcdir)/tcc/include -I$(srcdir)/tcc/include - 2>&1 | awk -f $(srcdir)/headers.awk | while read src dst; do \
           78  +			dst="$(DESTDIR)$(PACKAGE_INSTALL_DIR)/include/$$dst"; \
           79  +			if [ -e "$${dst}" ]; then continue; fi; \
           80  +			dstdir="$$(dirname "$$dst")"; \
           81  +			mkdir -p "$$dstdir"; \
           82  +			echo cp "$$src" "$$dst"; \
           83  +			cp "$$src" "$$dst"; \
           84  +		done
    96     85   
    97     86   test:
    98     87   	rm -rf __TMP__
    99     88   	$(MAKE) install tcllibdir=$(shell pwd)/__TMP__
   100     89   	-if [ "$(PACKAGE_VERSION)" = '@@VERS@@' ]; then cd __TMP__/* && sed -i 's|@@VERS@@|0.0.0.11|g' tcc4tcl.@SHOBJEXT@ pkgIndex.tcl; fi
   101     90   	tclsh test
   102     91   	echo Tests Completed OK > TEST-STATUS