Changeset 11924 in project for chicken


Ignore:
Timestamp:
09/08/08 03:06:29 (12 years ago)
Author:
Ivan Raikov
Message:

Fixes in support for SRCDIR and Windows installation.

Location:
chicken/trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • chicken/trunk/Makefile.bsd

    r11466 r11924  
    2626
    2727
    28 SRCDIR = .
    29 VPATH  = $(SRCDIR)
     28SRCDIR = ./
    3029
    3130# platform configuration
  • chicken/trunk/Makefile.cross-linux-mingw

    r11466 r11924  
    2626
    2727
    28 SRCDIR = .
    29 VPATH  = $(SRCDIR)
     28SRCDIR = ./
    3029
    3130# platform configuration
  • chicken/trunk/Makefile.cygwin

    r11497 r11924  
    2626
    2727
    28 SRCDIR = .
    29 VPATH  = $(SRCDIR)
     28SRCDIR = ./
    3029
    3130# platform configuration
  • chicken/trunk/Makefile.linux

    r11466 r11924  
    2626
    2727
    28 SRCDIR = .
    29 VPATH  = $(SRCDIR)
     28SRCDIR = ./
    3029
    3130# platform configuration
  • chicken/trunk/Makefile.macosx

    r11466 r11924  
    2626
    2727
    28 SRCDIR = .
    29 VPATH  = $(SRCDIR)
     28SRCDIR = ./
    3029
    3130# platform configuration
  • chicken/trunk/Makefile.mingw

    r11466 r11924  
    2626
    2727
    28 SRCDIR = .
    29 VPATH  = $(SRCDIR)
     28SRCDIR = .\\
    3029
    3130# platform configuration
  • chicken/trunk/Makefile.mingw-msys

    r11466 r11924  
    2626
    2727
    28 SRCDIR = .
    29 VPATH  = $(SRCDIR)
     28SRCDIR = ./
    3029
    3130# platform configuration
  • chicken/trunk/Makefile.msvc

    r9078 r11924  
    3333# Germany
    3434
    35 PREFIX = c:/msvc-devtools
     35PREFIX = c:\\msvc-devtools
     36SRCDIR = .\\
    3637
    3738# platform configuration
  • chicken/trunk/Makefile.solaris

    r11466 r11924  
    2626
    2727
    28 SRCDIR = .
    29 VPATH  = $(SRCDIR)
     28SRCDIR = ./
    3029
    3130# platform configuration
  • chicken/trunk/defaults.make

    r11900 r11924  
    4040# directories
    4141
    42 SRCDIR = .
    43 VPATH  = $(SRCDIR)
    44 
    45 DESTDIR =
     42SRCDIR ?= ./
     43
     44DESTDIR ?=
    4645
    4746ifeq ($(PLATFORM),mingw-msys)
     
    4948else
    5049ifeq ($(PLATFORM),mingw)
    51 PREFIX ?= c:/devtools
     50PREFIX ?= c:\\devtools
    5251else
    5352PREFIX ?= /usr/local
     
    7170ILIBDIR = $(PREFIX)\\lib
    7271ISHAREDIR = $(PREFIX)\\share
    73 IDATADIR = $(SHAREDIR)\\chicken
    74 ITOPMANDIR = $(SHAREDIR)\\man
    75 IMANDIR = $(TOPMANDIR)\\man1
    76 IINFODIR = $(SHAREDIR)\\info
     72IDATADIR = $(ISHAREDIR)\\chicken
     73ITOPMANDIR = $(ISHAREDIR)\\man
     74IMANDIR = $(ITOPMANDIR)\\man1
     75IINFODIR = $(ISHAREDIR)\\info
    7776IINCDIR = $(PREFIX)\\include
    78 IDOCDIR = $(DATADIR)\\doc
    79 ICHICKENLIBDIR = $(LIBDIR)\\chicken
    80 IEGGDIR = $(CHICKENLIBDIR)\\$(BINARYVERSION)
     77IDOCDIR = $(IDATADIR)\\doc
     78ICHICKENLIBDIR = $(ILIBDIR)\\chicken
     79IEGGDIR = $(ICHICKENLIBDIR)\\$(BINARYVERSION)
    8180else
    8281IBINDIR = $(BINDIR)
     
    156155PCRE_OBJECTS_1 =
    157156else
    158 PCRE_DIR ?= $(VPATH)/pcre
     157PCRE_DIR ?= $(SRCDIR)pcre
    159158C_COMPILER_PCRE_OPTIONS = -DPCRE_STATIC -DHAVE_CONFIG_H
    160159PCRE_INCLUDES = $(INCLUDES) -I$(PCRE_DIR)
     
    285284CHICKEN_PCRE_LIBRARY_OPTIONS =
    286285else
    287 CHICKEN_PCRE_LIBRARY_OPTIONS = -include-path $(SRCDIR)/pcre
     286CHICKEN_PCRE_LIBRARY_OPTIONS = -include-path $(SRCDIR)pcre
    288287endif
    289288
  • chicken/trunk/rules.make

    r11656 r11924  
    803803endif
    804804ifneq ($(POSTINSTALL_STATIC_LIBRARY),true)
     805ifdef WINDOWS
     806        $(POSTINSTALL_STATIC_LIBRARY) $(POSTINSTALL_STATIC_LIBRARY_FLAGS) \
     807          $(ILIBDIR)\\libchicken$(A)
     808        $(POSTINSTALL_STATIC_LIBRARY) $(POSTINSTALL_STATIC_LIBRARY_FLAGS) \
     809          $(ILIBDIR)\\libuchicken$(A)
     810else
    805811        $(POSTINSTALL_STATIC_LIBRARY) $(POSTINSTALL_STATIC_LIBRARY_FLAGS) \
    806812          $(ILIBDIR)/libchicken$(A)
     
    808814          $(ILIBDIR)/libuchicken$(A)
    809815endif
    810         $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)/chicken.h $(DESTDIR)$(IINCDIR)
     816endif
     817        $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)chicken.h $(DESTDIR)$(IINCDIR)
    811818        $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(CHICKEN_CONFIG_H) $(DESTDIR)$(IINCDIR)
    812819ifndef STATICBUILD
     
    846853          $(CSI_PROGRAM)$(EXE) $(CSC_PROGRAM)$(EXE) $(CHICKEN_PROFILE_PROGRAM)$(EXE) \
    847854          $(CHICKEN_SETUP_PROGRAM)$(EXE)
    848         $(MAKE) -f $(SRCDIR)/Makefile.$(PLATFORM) NEEDS_RELINKING=no RUNTIME_LINKER_PATH=$(LIBDIR) install
     855        $(MAKE) -f $(SRCDIR)Makefile.$(PLATFORM) NEEDS_RELINKING=no RUNTIME_LINKER_PATH=$(LIBDIR) install
    849856        $(MAKE_WRITABLE_COMMAND) $(CHICKEN_PROGRAM)$(EXE) $(CSI_PROGRAM)$(EXE) \
    850857          $(CSC_PROGRAM)$(EXE) $(CHICKEN_PROFILE_PROGRAM)$(EXE)
     
    881888endif
    882889endif
    883         $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)/chicken.1 $(DESTDIR)$(IMANDIR)
    884         $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)/csi.1 $(DESTDIR)$(IMANDIR)
    885         $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)/csc.1 $(DESTDIR)$(IMANDIR)
    886         $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)/chicken-setup.1 $(DESTDIR)$(IMANDIR)
    887         $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)/chicken-profile.1 $(DESTDIR)$(IMANDIR)
    888         $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)/chicken-bug.1 $(DESTDIR)$(IMANDIR)
     890        $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)chicken.1 $(DESTDIR)$(IMANDIR)
     891        $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)csi.1 $(DESTDIR)$(IMANDIR)
     892        $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)csc.1 $(DESTDIR)$(IMANDIR)
     893        $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)chicken-setup.1 $(DESTDIR)$(IMANDIR)
     894        $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)chicken-profile.1 $(DESTDIR)$(IMANDIR)
     895        $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)chicken-bug.1 $(DESTDIR)$(IMANDIR)
    889896        $(MAKEDIR_COMMAND) $(MAKEDIR_COMMAND_OPTIONS) $(DESTDIR)$(IDOCDIR)/html
    890         -$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)/html/* $(DESTDIR)$(IDOCDIR)/html
    891         -$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)/chicken.pdf $(DESTDIR)$(IDOCDIR)
    892         $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)/README $(DESTDIR)$(IDOCDIR)
    893         $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)/LICENSE $(DESTDIR)$(IDOCDIR)
    894         $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)/chicken-more-macros.scm $(DESTDIR)$(IDATADIR)
    895         $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)/chicken-ffi-macros.scm $(DESTDIR)$(IDATADIR)
    896         $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)/chicken-sys-macros.scm $(DESTDIR)$(IDATADIR)
     897        -$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)html/* $(DESTDIR)$(IDOCDIR)/html
     898        -$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)chicken.pdf $(DESTDIR)$(IDOCDIR)
     899        $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)README $(DESTDIR)$(IDOCDIR)
     900        $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)LICENSE $(DESTDIR)$(IDOCDIR)
     901        $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)chicken-more-macros.scm $(DESTDIR)$(IDATADIR)
     902        $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)chicken-ffi-macros.scm $(DESTDIR)$(IDATADIR)
     903        $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) $(SRCDIR)chicken-sys-macros.scm $(DESTDIR)$(IDATADIR)
    897904        $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) *.exports $(DESTDIR)$(IDATADIR)
    898905        -$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) chicken.info $(DESTDIR)$(IINFODIR)
    899906        $(INSTALLINFO_PROGRAM) $(INSTALLINFO_PROGRAM_OPTIONS) --infodir=$(DESTDIR)$(IINFODIR) chicken.info
    900907ifdef WINDOWS
    901         $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_EXECUTABLE_OPTIONS) $(SRCDIR)/csibatch.bat $(DESTDIR)$(IBINDIR)
     908        $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_EXECUTABLE_OPTIONS) $(SRCDIR)csibatch.bat $(DESTDIR)$(IBINDIR)
    902909endif
    903910endif
     
    11061113compiler-check:
    11071114        @echo "======================================== packing ..."
    1108         $(MAKE) -f $(SRCDIR)/Makefile.$(PLATFORM) dist
     1115        $(MAKE) -f $(SRCDIR)Makefile.$(PLATFORM) dist
    11091116        $(REMOVE_COMMAND $(REMOVE_COMMAND_RECURSIVE_OPTIONS) tests/chicken-*
    11101117        tar -C tests -xzf `ls -t chicken-*.tar.gz | head -1`
    11111118        @echo "======================================== building stage 1 ..."
    1112         $(MAKE) -f $(SRCDIR)/Makefile.$(PLATFORM) STATICBUILD=1 -C tests/chicken-* confclean all
     1119        $(MAKE) -f $(SRCDIR)Makefile.$(PLATFORM) STATICBUILD=1 -C tests/chicken-* confclean all
    11131120        touch tests/chicken-*/*.scm
    11141121        @echo "======================================== building stage 2 ..."
    1115         $(MAKE) -f $(SRCDIR)/Makefile.$(PLATFORM) STATICBUILD=1 -C tests/chicken-* confclean all
     1122        $(MAKE) -f $(SRCDIR)Makefile.$(PLATFORM) STATICBUILD=1 -C tests/chicken-* confclean all
    11161123        cat tests/chicken-*/*.c >tests/stage2.out
    11171124        @echo "======================================== building stage 3 ..."
    1118         $(MAKE) -f $(SRCDIR)/Makefile.$(PLATFORM) STATICBUILD=1 -C tests/chicken-* confclean all       
     1125        $(MAKE) -f $(SRCDIR)Makefile.$(PLATFORM) STATICBUILD=1 -C tests/chicken-* confclean all
    11191126        cat tests/chicken-*/*.c >tests/stage3.out
    11201127        diff tests/stage2.out tests/stage3.out >tests/stages.diff
     
    11261133.PHONY: bootstrap bootstrap.tar.gz
    11271134
    1128 bootstrap: $(SRCDIR)/bootstrap.tar.gz
    1129         gzip -d -c $(SRCDIR)/bootstrap.tar.gz | tar xvf -
     1135bootstrap: $(SRCDIR)bootstrap.tar.gz
     1136        gzip -d -c $(SRCDIR)bootstrap.tar.gz | tar xvf -
    11301137        touch *.c
    1131         $(MAKE) -f $(SRCDIR)/Makefile.$(PLATFORM) STATICBUILD=1 chicken$(EXE)
     1138        $(MAKE) -f $(SRCDIR)Makefile.$(PLATFORM) STATICBUILD=1 chicken$(EXE)
    11321139        cp chicken$(EXE) chicken-boot$(EXE)
    11331140        touch *.scm
    11341141
    1135 $(SRCDIR)/bootstrap.tar.gz: distfiles
    1136         tar cfz $(SRCDIR)/bootstrap.tar.gz library.c eval.c data-structures.c ports.c files.c extras.c \
     1142$(SRCDIR)bootstrap.tar.gz: distfiles
     1143        tar cfz $(SRCDIR)bootstrap.tar.gz library.c eval.c data-structures.c ports.c files.c extras.c \
    11371144        lolevel.c utils.c tcp.c srfi-1.c srfi-4.c srfi-13.c srfi-14.c srfi-18.c srfi-69.c \
    11381145        posixunix.c posixwin.c regex.c scheduler.c profiler.c stub.c match.c $(COMPILER_OBJECTS_1:=.c)
Note: See TracChangeset for help on using the changeset viewer.