From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Fri, 30 Sep 2005 08:25:50 +0000 (-0000)
Subject: - remove duplicate entry of resolve.c in BLKID_SRC
X-Git-Tag: 1_1_0~617
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f24e0f5e6f746d2889620bc95e3a7c818c4d348d;p=oweals%2Fbusybox.git

- remove duplicate entry of resolve.c in BLKID_SRC
- use the sourcedir to look for includes rather than the builddir
---

diff --git a/e2fsprogs/Makefile.in b/e2fsprogs/Makefile.in
index f7dbba30f..5def023f8 100644
--- a/e2fsprogs/Makefile.in
+++ b/e2fsprogs/Makefile.in
@@ -7,11 +7,12 @@
 E2FSPROGS_AR:=e2fsprogs.a
 
 E2FSPROGS_DIR:=$(top_builddir)/e2fsprogs
+E2FSPROGS_INC:=$(top_sourcedir)/e2fsprogs
 
-E2FSPROGS_CFLAGS := -I$(E2FSPROGS_DIR) -include $(E2FSPROGS_DIR)/e2fsbb.h
+E2FSPROGS_CFLAGS := -I$(E2FSPROGS_INC) -include $(E2FSPROGS_INC)/e2fsbb.h
 
 BLKID_SRC   := cache.c dev.c devname.c devno.c blkid_getsize.c \
-	       probe.c read.c resolve.c save.c tag.c resolve.c
+	       probe.c read.c resolve.c save.c tag.c
 BLKID_SRCS  := $(patsubst %,blkid/%, $(BLKID_SRC))
 BLKID_OBJS  := $(patsubst %.c,%.o, $(BLKID_SRCS))