From f15b8ade722394aa142ec4f63918c5b23b407193 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sun, 16 Nov 2008 22:19:57 +0000
Subject: Get rid of the local-test in Makefile.

 /trunk/Makefile.in       |   30    19    11     0 +++++++++++++++++++-----------
 /trunk/docs/overview.txt |   25    13    12     0 +++++++++++++------------
 2 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 1b19b2a..598b02c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -39,7 +39,7 @@ TARGETS := bin lib doc man
 
 build: $(patsubst %,build-%,$(TARGETS))
 
-install: local-test build $(patsubst %,install-%,$(TARGETS))
+install: real-install
 
 clean: $(patsubst %,clean-%,$(TARGETS))
 
@@ -47,7 +47,7 @@ distclean: clean
 	@echo "  RM     'Makefile'"
 	@rm -f Makefile
 
-uninstall: local-test $(patsubst %,uninstall-%,$(TARGETS))
+uninstall: real-uninstall
 
 ###############################################################################
 # Specific make rules
@@ -56,8 +56,6 @@ uninstall: local-test $(patsubst %,uninstall-%,$(TARGETS))
 # Build rules
 
 build-bin: ct-ng
-	@echo "  CHMOD  '$<'"
-	@chmod a+x $<
 
 build-lib:
 
@@ -100,16 +98,22 @@ clean-man:
 #--------------------------------------
 # Check for --local setup
 
-# If using locally, don't install
-local-test:
-	@if [ "$(LOCAL)" = "1" ]; then                                          \
-	     echo "You're using local copy as runtime. You can't (un)install."; \
-	     false;                                                             \
-	 fi
+ifeq ($(strip $(LOCAL)),1)
+
+real-install: build
+	@echo "  CHMOD  'ct-ng'"
+	@chmod a+x ct-ng
+
+real-uninstall:
+	@true
+
+else
 
 #--------------------------------------
 # Install rules
 
+real-install: build $(patsubst %,install-%,$(TARGETS))
+
 install-bin: $(DESTDIR)$(BINDIR)
 	@echo "  INST   'ct-ng'"
 	@install -m 755 ct-ng "$(DESTDIR)$(BINDIR)/ct-ng"
@@ -120,7 +124,7 @@ install-bin: $(DESTDIR)$(BINDIR)
 # is the goal of the install-lib rule to install the lib/ directory...
 install-lib: uninstall-lib $(DESTDIR)$(LIBDIR) install-lib-main install-lib-samples
 
-install-lib-main: $(LIBDIR)
+install-lib-main: $(DESTDIR)$(LIBDIR)
 	@for src_dir in config kconfig patches scripts tools; do                        \
 	     echo "  INST   '$${src_dir}/'";                                            \
 	     tar cf - --exclude=.svn $${src_dir} |(cd "$(DESTDIR)$(LIBDIR)"; tar xf -); \
@@ -157,6 +161,8 @@ $(sort $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(DOCDIR) $(DESTDIR)$(M
 #--------------------------------------
 # Uninstall rules
 
+real-uninstall: $(patsubst %,uninstall-%,$(TARGETS))
+
 uninstall-bin:
 	@echo "  RM     '$(DESTDIR)$(BINDIR)/ct-ng'"
 	@rm -f "$(DESTDIR)$(BINDIR)/ct-ng"
@@ -172,3 +178,5 @@ uninstall-doc:
 uninstall-man:
 	@echo "  RM     '$(DESTDIR)$(MANDIR)/ct-ng.1.gz'"
 	@rm -f "$(DESTDIR)$(MANDIR)/ct-ng.1"{,.gz}
+
+endif # Not --local
diff --git a/docs/overview.txt b/docs/overview.txt
index 8492959..a35a6c7 100644
--- a/docs/overview.txt
+++ b/docs/overview.txt
@@ -14,9 +14,9 @@ History
 Installing crosstool-NG
   Install method
   The hacker's way
+  Preparing for packaging
   Shell completion
   Contributed code
-  Preparing for packaging
 Configuring crosstool-NG
   Interesting config options
   Re-building an existing toolchain
@@ -145,6 +145,7 @@ If you go the hacker's way, then the usage is a bit different, although very
 simple:
   ./configure --local
   make
+  make install
 
 Now, *do not* remove crosstool-NG sources. They are needed to run crosstool-NG!
 Stay in the directory holding the sources, and run:
@@ -158,6 +159,17 @@ by running:
 
 and mailing me the result! :-P
 
+Preparing for packaging |
+------------------------+
+
+If you plan on packaging crosstool-NG, you surely don't want to install it
+in your root file system. The install procedure of crosstool-NG honors the
+DESTDIR variable:
+
+  ./configure --prefix=/usr
+  make
+  make DESDTDIR=/packaging/place install
+
 Shell completion |
 -----------------+
 
@@ -192,17 +204,6 @@ There is no guarantee that a particuliar contribution applies to the current
 version of crosstool-ng, or that it will work at all. Use contributions at
 your own risk.
 
-Preparing for packaging |
-------------------------+
-
-If you plan on packaging crosstool-NG, you surely don't want to install it
-in your root file system. The install procedure of crosstool-NG honors the
-DESTDIR variable:
-
-  ./configure --prefix=/usr
-  make
-  make DESDTDIR=/packaging/place install
-
 ____________________________
                            /
 Configuring crosstool-NG  /
-- 
cgit v0.10.2-6-g49f6