summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-06-21 05:41:41 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2014-06-21 05:41:41 (GMT)
commit90f603e2be40d996c421ae8e95464e38911eabaf (patch)
treea3a8aa942a9acf078eed1333404de22aaa106219 /docs
parentf9292cf478867567f80ad270d4351e9a48ef4d06 (diff)
s/TOPDIR/ADK_TOPDIR/
to avoid namespace collisions in some packages, rename TOPDIR. Sorry you need to make cleandir && make prereq && make
Diffstat (limited to 'docs')
-rw-r--r--docs/Makefile2
-rw-r--r--docs/adding-packages-auto.txt6
-rw-r--r--docs/adding-packages-host.txt20
-rw-r--r--docs/adding-packages-manual.txt6
4 files changed, 17 insertions, 17 deletions
diff --git a/docs/Makefile b/docs/Makefile
index 1670e00..f42f7fc 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,4 +1,4 @@
-TOPDIR=$(pwd)
+ADK_TOPDIR=$(pwd)
all: pdf text html
diff --git a/docs/adding-packages-auto.txt b/docs/adding-packages-auto.txt
index ac52c39..9af8c6a 100644
--- a/docs/adding-packages-auto.txt
+++ b/docs/adding-packages-auto.txt
@@ -13,7 +13,7 @@ package, with an example:
01: # This file is part of the OpenADK project. OpenADK is copyrighted
02: # material, please see the LICENCE file in the top-level directory.
03:
-04: include ${TOPDIR}/rules.mk
+04: include ${ADK_TOPDIR}/rules.mk
05:
06: PKG_NAME:= libfoo
07: PKG_VERSION:= 1.0
@@ -26,7 +26,7 @@ package, with an example:
14: PKG_URL:= http://www.libfoo.org/
15: PKG_SITES:= http://downloads.libfoo.org/
16:
-17: include ${TOPDIR}/mk/package.mk
+17: include ${ADK_TOPDIR}/mk/package.mk
18:
19: $(eval $(call PKG_template,LIBFOO,libfoo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
20:
@@ -34,7 +34,7 @@ package, with an example:
22: ${INSTALL_DIR} ${IDIR_LIBFOO}/usr/lib
23: ${CP} ${WRKINST}/usr/lib/libfoo.so* ${IDIR_LIBFOO}/usr/lib
24:
-25: include ${TOPDIR}/mk/pkg-bottom.mk
+25: include ${ADK_TOPDIR}/mk/pkg-bottom.mk
------------------------
diff --git a/docs/adding-packages-host.txt b/docs/adding-packages-host.txt
index c9eba6d..bf7ff71 100644
--- a/docs/adding-packages-host.txt
+++ b/docs/adding-packages-host.txt
@@ -13,7 +13,7 @@ by another target package to build, with an example:
01: # This file is part of the OpenADK project. OpenADK is copyrighted
02: # material, please see the LICENCE file in the top-level directory.
03:
-04: include $(TOPDIR)/rules.mk
+04: include $(ADK_TOPDIR)/rules.mk
05:
06: PKG_NAME:= hostfoo
07: PKG_VERSION:= 1.0
@@ -26,15 +26,15 @@ by another target package to build, with an example:
14:
15: PKG_CFLINE_HOSTFOO:= depends on ADK_HOST_ONLY
16:
-17: include $(TOPDIR)/mk/host.mk
-18: include $(TOPDIR)/mk/package.mk
+17: include $(ADK_TOPDIR)/mk/host.mk
+18: include $(ADK_TOPDIR)/mk/package.mk
19:
20: $(eval $(call HOST_template,HOSTFOO,hostfoo,$(PKG_VERSION)-${PKG_RELEASE}))
21:
22: HOST_STYLE:= auto
23:
-24: include ${TOPDIR}/mk/host-bottom.mk
-25: include ${TOPDIR}/mk/pkg-bottom.mk
+24: include ${ADK_TOPDIR}/mk/host-bottom.mk
+25: include ${ADK_TOPDIR}/mk/pkg-bottom.mk
------------------------
The differences to a target package is the inclusion of +mk/host.mk+ in line 17 and
@@ -47,7 +47,7 @@ Following mix between host and target package is possible, too:
01: # This file is part of the OpenADK project. OpenADK is copyrighted
02: # material, please see the LICENCE file in the top-level directory.
03:
-04: include ${TOPDIR}/rules.mk
+04: include ${ADK_TOPDIR}/rules.mk
05:
06: PKG_NAME:= foo
07: PKG_VERSION:= 1.0
@@ -59,8 +59,8 @@ Following mix between host and target package is possible, too:
13: PKG_URL:= http://www.foo.org/
14: PKG_SITES:= http://download.foo.org/
15:
-16: include ${TOPDIR}/mk/host.mk
-17: include ${TOPDIR}/mk/package.mk
+16: include ${ADK_TOPDIR}/mk/host.mk
+17: include ${ADK_TOPDIR}/mk/package.mk
18:
19: $(eval $(call HOST_template,FOO,foo,${PKG_VERSION}-${PKG_RELEASE}))
20: $(eval $(call PKG_template,FOO,foo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -71,8 +71,8 @@ Following mix between host and target package is possible, too:
25: ${INSTALL_DIR} ${IDIR_FOO}/usr/bin
26: ${INSTALL_BIN} ${WRKINST}/usr/bin/foo ${IDIR_FOO}/usr/bin
27:
-28: include ${TOPDIR}/mk/host-bottom.mk
-29: include ${TOPDIR}/mk/pkg-bottom.mk
+28: include ${ADK_TOPDIR}/mk/host-bottom.mk
+29: include ${ADK_TOPDIR}/mk/pkg-bottom.mk
------------------------
If you need to rebuild a mixed package, you can do:
diff --git a/docs/adding-packages-manual.txt b/docs/adding-packages-manual.txt
index b231c19..8bf6b32a 100644
--- a/docs/adding-packages-manual.txt
+++ b/docs/adding-packages-manual.txt
@@ -15,7 +15,7 @@ scripts.
01: # This file is part of the OpenADK project. OpenADK is copyrighted
02: # material, please see the LICENCE file in the top-level directory.
03:
-04: include $(TOPDIR)/rules.mk
+04: include $(ADK_TOPDIR)/rules.mk
05:
06: PKG_NAME:= libfoo
07: PKG_VERSION:= 1.0
@@ -28,7 +28,7 @@ scripts.
14: PKG_URL:= http://www.libfoo.org/
15: PKG_SITES:= http://download.libfoo.org/
16:
-17: include $(TOPDIR)/mk/package.mk
+17: include $(ADK_TOPDIR)/mk/package.mk
18:
19: $(eval $(call PKG_template,LIBFOO,libfoo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
20:
@@ -46,7 +46,7 @@ scripts.
32: ${INSTALL_DIR} ${IDIR_LIBFOO}/usr/lib
33: ${CP} ${WRKBUILD}/libfoo.so* ${IDIR_LIBFOO}/usr/lib
34:
-35: include ${TOPDIR}/mk/pkg-bottom.mk
+35: include ${ADK_TOPDIR}/mk/pkg-bottom.mk
--------------------------------
The Makefile begins with line 4 with the inclusion of the top level rules.mk