diff options
| author | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-04-03 16:38:37 +0000 |
|---|---|---|
| committer | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2001-04-03 16:38:37 +0000 |
| commit | 61000992a8b9c096ec029c0944babe8d23dfcba9 (patch) | |
| tree | 56adaeba8b892a37168c08d2796564de770e37cb | |
| parent | a4e240b392b5901b9ac42f6f7ee6a1c49c494520 (diff) | |
| download | busybox-w32-61000992a8b9c096ec029c0944babe8d23dfcba9.tar.gz busybox-w32-61000992a8b9c096ec029c0944babe8d23dfcba9.tar.bz2 busybox-w32-61000992a8b9c096ec029c0944babe8d23dfcba9.zip | |
Fix for bug 1143 from Larry Doolittle
-Erik
git-svn-id: svn://busybox.net/trunk/busybox@2230 69ca8d6d-28ef-0310-b511-8ec308f3f277
| -rw-r--r-- | Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
| @@ -224,7 +224,6 @@ else | |||
| 224 | endif | 224 | endif |
| 225 | 225 | ||
| 226 | LIBBB = libbb | 226 | LIBBB = libbb |
| 227 | LIBBB_DIR = $(BB_SRC_DIR:=/)$(LIBBB) | ||
| 228 | LIBBB_LIB = libbb.a | 227 | LIBBB_LIB = libbb.a |
| 229 | LIBBB_CSRC= ask_confirmation.c check_wildcard_match.c chomp.c copy_file.c \ | 228 | LIBBB_CSRC= ask_confirmation.c check_wildcard_match.c chomp.c copy_file.c \ |
| 230 | copy_file_chunk.c create_path.c device_open.c error_msg.c \ | 229 | copy_file_chunk.c create_path.c device_open.c error_msg.c \ |
| @@ -238,7 +237,11 @@ syslog_msg_with_name.c time_string.c trim.c vdprintf.c wfopen.c xfuncs.c \ | |||
| 238 | xregcomp.c error_msg_and_die.c perror_msg.c perror_msg_and_die.c \ | 237 | xregcomp.c error_msg_and_die.c perror_msg.c perror_msg_and_die.c \ |
| 239 | verror_msg.c vperror_msg.c mtab.c mtab_file.c | 238 | verror_msg.c vperror_msg.c mtab.c mtab_file.c |
| 240 | LIBBB_OBJS=$(patsubst %.c,$(LIBBB)/%.o, $(LIBBB_CSRC)) | 239 | LIBBB_OBJS=$(patsubst %.c,$(LIBBB)/%.o, $(LIBBB_CSRC)) |
| 241 | LIBBB_CFLAGS = -I$(LIBBB_DIR) | 240 | LIBBB_CFLAGS = -I$(LIBBB) |
| 241 | ifneq ($(strip $(BB_SRC_DIR)),) | ||
| 242 | LIBBB_CFLAGS += -I$(BB_SRC_DIR)/$(LIBBB) | ||
| 243 | endif | ||
| 244 | |||
| 242 | 245 | ||
| 243 | # Put user-supplied flags at the end, where they | 246 | # Put user-supplied flags at the end, where they |
| 244 | # have a chance of winning. | 247 | # have a chance of winning. |