[prev in list] [next in list] [prev in thread] [next in thread] 

List:       busybox
Subject:    [BusyBox] bug#1143: PATCH ENCLOSED makes pristine builds work right
From:       Larry Doolittle <ldoolitt () recycle ! lbl ! gov>
Date:       2001-03-30 0:37:16
[Download RAW message or body]

Here is how I suggest fixing the problem.

Normal builds of source in libbb needs "-Ilibbb",
which finds both loop.h and libbb.h.

Pristine builds of source in libbb need both "-Isomewhere/libbb",
to find libbb.h, and "-Ilibbb", to find loop.h.

         - Larry

diff -urN /home/ldoolitt/cvs/busybox/Makefile busybox-trial/Makefile
--- /home/ldoolitt/cvs/busybox/Makefile	Tue Mar 27 13:53:03 2001
+++ busybox-trial/Makefile	Thu Mar 29 16:30:24 2001
@@ -224,7 +224,6 @@
 endif
     
 LIBBB	  = libbb
-LIBBB_DIR = $(BB_SRC_DIR:=/)$(LIBBB)
 LIBBB_LIB = libbb.a
 LIBBB_CSRC= ask_confirmation.c check_wildcard_match.c chomp.c copy_file.c \
 copy_file_chunk.c create_path.c device_open.c error_msg.c \
@@ -238,7 +237,10 @@
 xregcomp.c error_msg_and_die.c perror_msg.c perror_msg_and_die.c \
 verror_msg.c vperror_msg.c 
 LIBBB_OBJS=$(patsubst %.c,$(LIBBB)/%.o, $(LIBBB_CSRC))
-LIBBB_CFLAGS = -I$(LIBBB_DIR)
+LIBBB_CFLAGS = -I$(LIBBB)
+ifneq ($(strip $(BB_SRC_DIR)),)
+    LIBBB_CFLAGS += -I$(BB_SRC_DIR)/$(LIBBB)
+endif
 
 # Put user-supplied flags at the end, where they
 # have a chance of winning.




[prev in list] [next in list] [prev in thread] [next in thread]