--- a/Makefile.in	Mon May 02 23:48:16 2016 +0200
+++ b/Makefile.in	Wed May 04 15:33:40 2016 +0200
@@ -24,6 +24,10 @@
 LIBTOM_LIBS=$(STATIC_LTC) $(STATIC_LTM) 
 endif
 
+ifneq ($(wildcard localoptions.h),)
+CFLAGS+=-DLOCALOPTIONS_H_EXISTS
+endif
+
 COMMONOBJS=dbutil.o buffer.o dbhelpers.o \
 		dss.o bignum.o \
 		signkey.o rsa.o dbrandom.o \
@@ -76,6 +80,8 @@
 sbindir=@sbindir@
 mandir=@mandir@
 
+.DELETE_ON_ERROR:
+
 CC=@CC@
 AR=@AR@
 RANLIB=@RANLIB@
@@ -194,12 +200,14 @@
 	-rm -f $*$(EXEEXT)
 	-ln -s dropbearmulti$(EXEEXT) $*$(EXEEXT)
 
-$(STATIC_LTC): options.h
+$(STATIC_LTC): options.h default_options.h
 	cd libtomcrypt && $(MAKE)
 
-$(STATIC_LTM): options.h
+$(STATIC_LTM): options.h default_options.h
 	cd libtommath && $(MAKE)
 
+%.o: default_options.h
+
 .PHONY : clean sizes thisclean distclean tidy ltc-clean ltm-clean
 
 ltc-clean:
@@ -215,7 +223,7 @@
 
 thisclean:
 	-rm -f dropbear dbclient dropbearkey dropbearconvert scp scp-progress \
-			dropbearmulti *.o *.da *.bb *.bbg *.prof 
+			dropbearmulti *.o *.da *.bb *.bbg *.prof default_options.h
 
 distclean: clean tidy
 	-rm -f config.h
@@ -223,3 +231,8 @@
 
 tidy:
 	-rm -f *~ *.gcov */*~
+
+default_options.h: default_options.h.in 
+	echo "# > > > Generated from $^, edit that file instead !" > $@
+	echo >> $@
+	$(srcdir)/ifndef_wrapper.sh < $^ 	> $@