diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-02-25 18:20:34 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-02-25 18:20:34 +0000 |
| commit | 636f4cc8ac224f27632009f6314287961d1ccc31 (patch) | |
| tree | a23b6e3878add984d9af143cd9ac06725aad64d1 /target/linux/x86-2.6/image/grub | |
| parent | 51fc1b8875ea747252c2c7fd363cbb10c57d5ab2 (diff) | |
clean up a few things in image build makefiles and fix unnecessary grub rebuilds
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6360 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/x86-2.6/image/grub')
| -rw-r--r-- | target/linux/x86-2.6/image/grub/Makefile | 36 |
1 files changed, 10 insertions, 26 deletions
diff --git a/target/linux/x86-2.6/image/grub/Makefile b/target/linux/x86-2.6/image/grub/Makefile index 365b327622..d37803012c 100644 --- a/target/linux/x86-2.6/image/grub/Makefile +++ b/target/linux/x86-2.6/image/grub/Makefile @@ -23,34 +23,19 @@ PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/grub-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk ifeq ($(HOST_ARCH),x86_64) - define Build/Configure - (cd $(PKG_BUILD_DIR); \ - LDFLAGS="-static" \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --program-prefix="" \ - --program-suffix="" \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin \ - --libexecdir=/usr/lib \ - --sysconfdir=/etc \ - --datadir=/usr/share \ - --localstatedir=/var \ - --mandir=/usr/man \ - --infodir=/usr/info \ - $(DISABLE_NLS) \ - --disable-auto-linux-mem-opt \ - ) - endef +CONFIGURE_FLAGS:= \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) else - define Build/Configure +CONFIGURE_FLAGS:= +endif + +define Build/Configure (cd $(PKG_BUILD_DIR); \ LDFLAGS="-static" \ ./configure \ + $(CONFIGURE_FLAGS) \ --program-prefix="" \ --program-suffix="" \ --prefix=/usr \ @@ -66,8 +51,7 @@ else $(DISABLE_NLS) \ --disable-auto-linux-mem-opt \ ) - endef -endif +endef # # ./configure detects whether the host compiler supports |