diff --git a/Makefile.in b/Makefile.in
index 597b105..595bc07 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -93,7 +93,9 @@ $(OBJDBG)/%.o: \
 	@$(MKDIR) `dirname $@`
 	@$(CC) \
 		$(CFLAGS) \
-		-Wall -Wextra -fstack-check -DDEBUG=1 \
+		-Wall -Wextra -fstack-check \
+		-DDEBUG=1 \
+		-DDATADIR=$(BASEDIR) \
 		-o $@ -c $<
 
 #---[ Release Rules ]--------------------------------------------------------------------
@@ -107,6 +109,7 @@ $(OBJRLS)/%.o: \
 	@$(CC) \
 		$(CFLAGS) \
 		-DNDEBUG=1 \
+		-DDATADIR=$(datarootdir)/pw3270 \
 		-o $@ -c $<
 
 #---[ Release Targets ]------------------------------------------------------------------
diff --git a/autogen.sh b/autogen.sh
index cd89c5a..dc2863e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,7 +18,7 @@ if test $? != 0 ; then
 	exit -1
 fi
 
-mkdir scripts
+mkdir -p scripts
 automake --add-missing 2> /dev/null | true
 
 cd "$olddir"
--
libgit2 0.21.2