~ chicken-core (chicken-5) e15c38b7c50061a5a3c8b5575c09b7601e022c74
commit e15c38b7c50061a5a3c8b5575c09b7601e022c74
Author: felix <bunny351@gmail.com>
AuthorDate: Tue Apr 27 08:11:30 2010 +0200
Commit: felix <bunny351@gmail.com>
CommitDate: Tue Apr 27 08:11:30 2010 +0200
minor fixes in rules.make
diff --git a/rules.make b/rules.make
index a5fca2bb..27c02387 100644
--- a/rules.make
+++ b/rules.make
@@ -649,12 +649,14 @@ install-bin:
$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(IMPORT_LIBRARIES:%=%.so)
$(REMOVE_COMMAND) $(REMOVE_COMMAND_OPTIONS) $(IMPORT_LIBRARIES:%=%.import.so)
$(MAKE) -f $(SRCDIR)Makefile.$(PLATFORM) CONFIG=$(CONFIG) NEEDS_RELINKING=no RUNTIME_LINKER_PATH="$(LIBDIR)" SONAME_VERSION=.$(BINARYVERSION) install-bin
- $(MAKE_WRITABLE_COMMAND) $(CHICKEN_PROGRAM)$(EXE) $(CSI_PROGRAM)$(EXE) $(CSC_PROGRAM)$(EXE) $(CHICKEN_PROFILE_PROGRAM)$(EXE)
-ifndef STATICBUILD
- $(MAKE_WRITABLE_COMMAND) $(CHICKEN_INSTALL_PROGRAM)$(EXE)
- $(MAKE_WRITABLE_COMMAND) $(CHICKEN_UNINSTALL_PROGRAM)$(EXE)
- $(MAKE_WRITABLE_COMMAND) $(CHICKEN_STATUS_PROGRAM)$(EXE)
-endif
+# Damn. What was this for, again?
+#
+# $(MAKE_WRITABLE_COMMAND) $(CHICKEN_PROGRAM)$(EXE) $(CSI_PROGRAM)$(EXE) $(CSC_PROGRAM)$(EXE) $(CHICKEN_PROFILE_PROGRAM)$(EXE)
+# ifndef STATICBUILD
+# $(MAKE_WRITABLE_COMMAND) $(CHICKEN_INSTALL_PROGRAM)$(EXE)
+# $(MAKE_WRITABLE_COMMAND) $(CHICKEN_UNINSTALL_PROGRAM)$(EXE)
+# $(MAKE_WRITABLE_COMMAND) $(CHICKEN_STATUS_PROGRAM)$(EXE)
+# endif
else
install-bin: $(TARGETS) install-libs install-dev install-target
$(MAKEDIR_COMMAND) $(MAKEDIR_COMMAND_OPTIONS) "$(DESTDIR)$(IBINDIR)"
@@ -695,7 +697,6 @@ ifneq ($(POSTINSTALL_PROGRAM),true)
$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) "$(DESTDIR)$(IEGGDIR)$(SEP)utils.import.so"
endif
ifdef STATICBUILD
-# copy/xcopy is too dumb on Windows
$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) scheme.import.scm "$(DESTDIR)$(IEGGDIR)"
$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) chicken.import.scm "$(DESTDIR)$(IEGGDIR)"
$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_FILE_OPTIONS) lolevel.import.scm "$(DESTDIR)$(IEGGDIR)"
@@ -753,16 +754,14 @@ ifneq ($(POSTINSTALL_PROGRAM),true)
endif
$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_EXECUTABLE_OPTIONS) setup-api.so "$(DESTDIR)$(IEGGDIR)"
$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_EXECUTABLE_OPTIONS) setup-download.so "$(DESTDIR)$(IEGGDIR)"
-ifeq ($(CROSS_CHICKEN),)
-ifeq ($(DESTDIR),)
- -$(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_INSTALL_PROGRAM) -update-db
+ifeq ($(CROSS_CHICKEN)$(DESTDIR),0)
+ -$(IBINDIR)$(SEP)$(CHICKEN_INSTALL_PROGRAM) -update-db
else
@echo
@echo "Warning: cannot run `chicken-install -update-db' when DESTDIR is set"
@echo
endif
endif
-endif
ifdef WINDOWS_SHELL
$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_EXECUTABLE_OPTIONS) $(SRCDIR)csibatch.bat "$(DESTDIR)$(IBINDIR)"
endif
Trap