clarify that you must install gnustep-make to install the documentation

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@37545 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2014-01-06 22:21:37 +00:00
parent f1fe782b69
commit 755e5f6003
3 changed files with 30 additions and 7 deletions

View file

@ -1,6 +1,14 @@
2014-01-06 Richard Frith-Macdonald <rfm@gnu.org>
* INSTALL:
* Documentation/GNUmakefile:
Make it clearer (ie very explicit) that you need to install
gnustep-make in order to install documentation.
2013-12-25 Fred Kiefer <FredKiefer@gmx.de>
* Instance/rules.make: Add detection for different forms of the Info.plist.
* Instance/rules.make: Add detection for different forms of
the Info.plist.
* Instance/application.make,
* Instance/bundle.make,
* Instance/framework.make,

View file

@ -23,14 +23,20 @@ ifeq ($(GNUSTEP_MAKEFILES),)
# in the subdirectory ./tmp-installation, the run make again passing
# GNUSTEP_MAKEFILES set to point to the new makefile installation
# To execute all, or clean, or install, we first depend on a local
# To execute all, or clean, we first depend on a local
# temporary installation of gnustep-make; when we have it, we source
# GNUstep.sh, then we run the make command again. Please note that
# "make install" will install into our temporary gnustep-make
# directory, which is usually not particularly useful, but anyway.
all clean install regenerate: ./tmp-installation/System/Library/Makefiles
# GNUstep.sh, then we run the make command again.
all regenerate: ./tmp-installation/System/Library/Makefiles
@echo "** Running 'make $@' using the local/temporary gnustep-make installation **"
$(MAKE) $@ GNUSTEP_MAKEFILES="$(CURRENT_DIR)/tmp-installation/System/Library/Makefiles"
@echo "** Finished local/temporary documentation in $(CURRENT_DIR)/tmp-installation. **"
@echo "** Use an installed gnustep-make if you wish to install documentation. **"
clean: ./tmp-installation/System/Library/Makefiles
$(MAKE) $@ GNUSTEP_MAKEFILES="$(CURRENT_DIR)/tmp-installation/System/Library/Makefiles"
install:
@echo "** To install the documentation you first install/set-up gnustep-make **"
CURRENT_DIR = $(shell pwd)

11
INSTALL
View file

@ -38,7 +38,9 @@ GNUstep-HOWTO and are also located at the GNUstep web site at
will end up installed into /usr/GNUstep using a GNUstep-tailored
filesystem layout).
To make and install the documentation:
To make and install the documentation you must first have configured and
installed gnustep-make (and set up your environment by sourceing GNUstep.sh
if necessary). Once that's done all that's required is:
cd Documentation
make
@ -224,6 +226,13 @@ your GNUSTEP_SYSTEM_LIBRARIES, GNUSTEP_NETWORK_LIBRARIES and
GNUSTEP_LOCAL_LIBRARIES to your linker paths (which is /etc/ld.so.conf
on GNU/Linux).
It is recommended that, unless gnustep-make was installed in the native
filesystem layout for your operating system, the GNUstep environment is set
up by sourcing the GNUstep.sh file.
eg.
. /usr/GNUstep/System/Library/Makefiles/GNUstep.sh
To build software, you also need to set GNUSTEP_MAKEFILES. (PS: This
requirement is likely to go away soon)