diff options
| author | William Hubbs <williamh@gentoo.org> | 2011-10-17 20:18:39 -0500 |
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2011-10-18 03:23:00 -0500 |
| commit | ecf77254bbacf5b53d940a738ea6cdc569a28958 (patch) | |
| tree | 22d9f6ec6b4882311917fe8d629c24c446bdec9d /init.d.misc | |
| parent | 9f95878bbd5461837b00b5ea2134768302776584 (diff) | |
consolodate Makefiles
The tree contained many operating system specific Makefiles which were
being included in other Makefiles. This commit removes those and adds
the code to the makefiles which included them using make's conditional
processing.
X-Gentoo-Bug: 387441
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=387441
Diffstat (limited to 'init.d.misc')
| -rw-r--r-- | init.d.misc/Makefile | 9 | ||||
| -rw-r--r-- | init.d.misc/Makefile.FreeBSD | 1 | ||||
| -rw-r--r-- | init.d.misc/Makefile.Linux | 1 | ||||
| -rw-r--r-- | init.d.misc/Makefile.NetBSD | 1 |
4 files changed, 8 insertions, 4 deletions
diff --git a/init.d.misc/Makefile b/init.d.misc/Makefile index 2b2a51ba..b44063cc 100644 --- a/init.d.misc/Makefile +++ b/init.d.misc/Makefile @@ -8,4 +8,11 @@ MK= ../mk SED_EXTRA+= -e 's:@VARBASE@:/var:g' include ${MK}/scripts.mk -include Makefile.${OS} + +ifeq ($(OS),FreeBSD) +PKG_PREFIX?= /usr/local +else ifeq ($(OS),Linux) +PKG_PREFIX?=/usr +else ifeq ($(OS),NetBSD) +PKG_PREFIX?= /usr/pkg +endif diff --git a/init.d.misc/Makefile.FreeBSD b/init.d.misc/Makefile.FreeBSD deleted file mode 100644 index 031049d2..00000000 --- a/init.d.misc/Makefile.FreeBSD +++ /dev/null @@ -1 +0,0 @@ -PKG_PREFIX?= /usr/local diff --git a/init.d.misc/Makefile.Linux b/init.d.misc/Makefile.Linux deleted file mode 100644 index e280d766..00000000 --- a/init.d.misc/Makefile.Linux +++ /dev/null @@ -1 +0,0 @@ -PKG_PREFIX?=/usr diff --git a/init.d.misc/Makefile.NetBSD b/init.d.misc/Makefile.NetBSD deleted file mode 100644 index 73fc2b7d..00000000 --- a/init.d.misc/Makefile.NetBSD +++ /dev/null @@ -1 +0,0 @@ -PKG_PREFIX?= /usr/pkg |