~ chicken-core (chicken-5) a0960b7f22c0481677a904e6e5fa5c2a5934985f
commit a0960b7f22c0481677a904e6e5fa5c2a5934985f
Author: felix <felix@call-with-current-continuation.org>
AuthorDate: Tue Mar 16 13:05:51 2010 +0100
Commit: felix <felix@call-with-current-continuation.org>
CommitDate: Tue Mar 16 13:05:51 2010 +0100
removed chicken-fetch and chicken-remove
diff --git a/Makefile.cygwin b/Makefile.cygwin
index 4f0edf8a..927352f1 100644
--- a/Makefile.cygwin
+++ b/Makefile.cygwin
@@ -36,7 +36,6 @@ SRCDIR = ./
ARCH ?= x86
HACKED_APPLY ?= 1
DLLSINPATH = 1
-INSTALL_FETCH_AND_REMOVE ?= 1
# options
diff --git a/Makefile.mingw b/Makefile.mingw
index e7e1b7fc..847e9471 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -40,7 +40,6 @@ ARCH ?= x86
WINDOWS = 1
WINDOWS_SHELL = 1
UNAME_SYS = MinGW
-INSTALL_FETCH_AND_REMOVE ?= 1
ifeq ($(ARCH),x86)
HACKED_APPLY ?= 1
diff --git a/Makefile.mingw-msys b/Makefile.mingw-msys
index 8f9a3d3a..b759e729 100644
--- a/Makefile.mingw-msys
+++ b/Makefile.mingw-msys
@@ -41,7 +41,6 @@ else
HACKED_APPLY =
endif
WINDOWS = 1
-INSTALL_FETCH_AND_REMOVE ?= 1
# file extensions
diff --git a/README b/README
index cef06cc4..481b63e2 100644
--- a/README
+++ b/README
@@ -300,13 +300,6 @@
provided (`Makefile.mingw-msys' and `Makefile.mingw').
Please also read the notes below.
- - On Windows Vista and later versions, programs that have
- names including the words `setup' or `install' will
- require administrator rights to execute correctly. For this
- reason the `chicken-install.exe' and `chicken-uninstall.exe'
- programs are also available under the names `chicken-fetch.exe'
- and `chicken-remove.exe', respectively
-
- When installing under the mingw-msys platform, PREFIX must be an
absolute path name (i.e. it must include the drive letter) and
must use forward slashes (no backward slashes).
diff --git a/chicken.rc b/chicken.rc
index e0cbdb0e..9d2d6743 100644
--- a/chicken.rc
+++ b/chicken.rc
@@ -1,3 +1,3 @@
-/* chicken.rc - Resource script for Windoze - felix */
-
-CHICKEN_ICON ICON "chicken.ico"
+/* chicken.rc - Resource script for Windoze - felix */
+
+CHICKEN_ICON ICON "chicken.ico"
diff --git a/defaults.make b/defaults.make
index efb9f924..e57128be 100644
--- a/defaults.make
+++ b/defaults.make
@@ -311,9 +311,7 @@ CSC_PROGRAM = $(PROGRAM_PREFIX)csc$(PROGRAM_SUFFIX)
CSI_PROGRAM = $(PROGRAM_PREFIX)csi$(PROGRAM_SUFFIX)
CHICKEN_PROFILE_PROGRAM = $(PROGRAM_PREFIX)chicken-profile$(PROGRAM_SUFFIX)
CHICKEN_INSTALL_PROGRAM = $(PROGRAM_PREFIX)chicken-install$(PROGRAM_SUFFIX)
-CHICKEN_FETCH_PROGRAM = $(PROGRAM_PREFIX)chicken-fetch$(PROGRAM_SUFFIX)
CHICKEN_UNINSTALL_PROGRAM = $(PROGRAM_PREFIX)chicken-uninstall$(PROGRAM_SUFFIX)
-CHICKEN_REMOVE_PROGRAM = $(PROGRAM_PREFIX)chicken-remove$(PROGRAM_SUFFIX)
CHICKEN_STATUS_PROGRAM = $(PROGRAM_PREFIX)chicken-status$(PROGRAM_SUFFIX)
CHICKEN_BUG_PROGRAM = $(PROGRAM_PREFIX)chicken-bug$(PROGRAM_SUFFIX)
IMPORT_LIBRARIES = chicken lolevel srfi-1 srfi-4 data-structures ports files posix srfi-13 srfi-69 extras \
diff --git a/rules.make b/rules.make
index d2d0ad49..c7ea82e7 100644
--- a/rules.make
+++ b/rules.make
@@ -872,10 +872,6 @@ endif
ifndef STATICBUILD
$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_EXECUTABLE_OPTIONS) $(CHICKEN_INSTALL_PROGRAM)$(EXE) "$(DESTDIR)$(IBINDIR)"
$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_EXECUTABLE_OPTIONS) $(CHICKEN_UNINSTALL_PROGRAM)$(EXE) "$(DESTDIR)$(IBINDIR)"
-ifneq ($(INSTALL_FETCH_AND_REMOVE),)
- $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_EXECUTABLE_OPTIONS) $(CHICKEN_INSTALL_PROGRAM)$(EXE) "$(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_FETCH_PROGRAM)"
- $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_EXECUTABLE_OPTIONS) $(CHICKEN_UNINSTALL_PROGRAM)$(EXE) "$(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_REMOVE_PROGRAM)"
-endif
$(INSTALL_PROGRAM) $(INSTALL_PROGRAM_EXECUTABLE_OPTIONS) $(CHICKEN_STATUS_PROGRAM)$(EXE) "$(DESTDIR)$(IBINDIR)"
ifneq ($(POSTINSTALL_PROGRAM),true)
$(POSTINSTALL_PROGRAM) $(POSTINSTALL_PROGRAM_FLAGS) "$(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_INSTALL_PROGRAM)"
@@ -884,11 +880,7 @@ ifneq ($(POSTINSTALL_PROGRAM),true)
endif
ifneq ($(CROSS_CHICKEN),1)
ifeq ($(DESTDIR),)
-ifneq ($(INSTALL_FETCH_AND_REMOVE),)
- -$(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_FETCH_PROGRAM) -update-db
-else
-$(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_INSTALL_PROGRAM) -update-db
-endif
else
@echo
@echo "Warning: cannot run chicken-install -update-db when DESTDIR is set"
@@ -982,8 +974,6 @@ uninstall:
"$(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_PROFILE_PROGRAM)$(EXE)" \
"$(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_INSTALL_PROGRAM)$(EXE)" \
"$(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_UNINSTALL_PROGRAM)$(EXE)" \
- "$(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_FETCH_PROGRAM)$(EXE)" \
- "$(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_REMOVE_PROGRAM)$(EXE)" \
"$(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_STATUS_PROGRAM)$(EXE)" \
"$(DESTDIR)$(IBINDIR)$(SEP)$(CSC_PROGRAM)$(EXE)" \
"$(DESTDIR)$(IBINDIR)$(SEP)$(CHICKEN_BUG_PROGRAM)$(EXE)"
Trap