From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 23 Mar 2006 03:47:19 +0000 (-0000)
Subject: make the makefile a little more flexible so we can store in either location
X-Git-Tag: 1_1_0~35
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dce5809ebca770be1202e52985c1570c352609b7;p=oweals%2Fbusybox.git

make the makefile a little more flexible so we can store in either location
---

diff --git a/networking/udhcp/Makefile b/networking/udhcp/Makefile
index 7c027edc0..469ac3dc1 100644
--- a/networking/udhcp/Makefile
+++ b/networking/udhcp/Makefile
@@ -1,36 +1,5 @@
-# Makefile for busybox
-#
-# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-
-ifndef top_srcdir
-top_srcdir=../..
+ifneq ($(wildcard ../../networking/Config.in),)
+include Makefile.busybox
+else
+include Makefile.udhcp
 endif
-ifndef top_builddir
-top_builddir=../..
-endif
-srcdir=$(top_srcdir)/networking/udhcp
-UDHCP_DIR:=./
-include $(top_builddir)/Rules.mak
-include $(top_builddir)/.config
-include Makefile.in
-all: $(libraries-y)
--include $(top_builddir)/.depend
-
-clean:
-	rm -f *.o *.a $(AR_TARGET)
-
diff --git a/networking/udhcp/Makefile.busybox b/networking/udhcp/Makefile.busybox
new file mode 100644
index 000000000..7c027edc0
--- /dev/null
+++ b/networking/udhcp/Makefile.busybox
@@ -0,0 +1,36 @@
+# Makefile for busybox
+#
+# Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+
+ifndef top_srcdir
+top_srcdir=../..
+endif
+ifndef top_builddir
+top_builddir=../..
+endif
+srcdir=$(top_srcdir)/networking/udhcp
+UDHCP_DIR:=./
+include $(top_builddir)/Rules.mak
+include $(top_builddir)/.config
+include Makefile.in
+all: $(libraries-y)
+-include $(top_builddir)/.depend
+
+clean:
+	rm -f *.o *.a $(AR_TARGET)
+