$(srcdir) is different from @srcdir@, so it better have a different name

Author: turistu

Makefile.in

@@ -3,7 +3,7 @@
 
 PROGRAMS=dropbear dbclient dropbearkey dropbearconvert scp
 
-srcdir=@srcdir@/src
+src = @srcdir@/src
 
 STATIC_LTC=libtomcrypt/libtomcrypt.a
 STATIC_LTM=libtommath/libtommath.a
@@ -18,7 +18,7 @@ ifeq (@BUNDLED_LIBTOM@, 1)
 	LIBTOM_LIBS=$(STATIC_LTC) $(STATIC_LTM)
 endif
 
-OPTION_HEADERS = default_options_guard.h $(srcdir)/sysoptions.h
+OPTION_HEADERS = default_options_guard.h $(src)/sysoptions.h
 ifneq ($(wildcard @srcdir@/localoptions.h),)
 	CPPFLAGS+=-DLOCALOPTIONS_H_EXISTS
 	OPTION_HEADERS += @srcdir@/localoptions.h
@@ -107,7 +107,7 @@ AR=@AR@
 RANLIB=@RANLIB@
 STRIP=@STRIP@
 INSTALL=@INSTALL@
-CPPFLAGS+=-I$(srcdir) -I@abs_top_builddir@
+CPPFLAGS+=-I$(src) -I@abs_top_builddir@
 CFLAGS+=@CFLAGS@ @ZLIB_CFLAGS@
 LIBS+=@LIBS@ @ZLIB_LIBS@
 LDFLAGS=@LDFLAGS@
@@ -150,30 +150,30 @@ multi: dropbearmulti
 install-multi: inst_dropbearmulti
 
 # for simplicity assume all source depends on all headers
-HEADERS=$(wildcard $(srcdir)/*.h *.h) $(OPTION_HEADERS)
+HEADERS=$(wildcard $(src)/*.h *.h) $(OPTION_HEADERS)
 
 MULTI_CPPFLAGS = $(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI
 
 sep-obj multi-obj:
 	mkdir -p $@
 
-sep-obj/%.o: $(srcdir)/%.c $(HEADERS) | sep-obj
+sep-obj/%.o: $(src)/%.c $(HEADERS) | sep-obj
 	$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
 
-fuzz/%.o: $(srcdir)/%.c $(HEADERS)
+fuzz/%.o: $(src)/%.c $(HEADERS)
 	$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
 
-fuzz/%.o: $(srcdir)/../fuzz/%.c $(HEADERS)
+fuzz/%.o: $(src)/../fuzz/%.c $(HEADERS)
 	$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
 
-multi-obj/%.o: $(srcdir)/%.c $(HEADERS) | multi-obj
+multi-obj/%.o: $(src)/%.c $(HEADERS) | multi-obj
 	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(MULTI_CPPFLAGS) $< -o $@
 
 
-default_options_guard.h: $(srcdir)/default_options.h
+default_options_guard.h: $(src)/default_options.h
 	@echo Creating $@
 	@printf "/*\n > > > Do not edit this file (default_options_guard.h) < < <\nGenerated from "$^"\nLocal customisation goes in localoptions.h\n*/\n\n" > $@.tmp
-	@$(srcdir)/ifndef_wrapper.sh < $^ >> $@.tmp
+	@$(src)/ifndef_wrapper.sh < $^ >> $@.tmp
 	mv $@.tmp $@
 
 strip: $(PROGRAMS)
@@ -277,7 +277,7 @@ tidy:
 	rm -f *~ *.gcov */*~
 
 lint:
-	cd $(srcdir); ./dropbear_lint.sh
+	cd $(src); ./dropbear_lint.sh
 
 check: lint
 	$(MAKE) -C test