From b06736ae7ee2af15c2d7176ca9cf241661b7cb49 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@linux.intel.com>
Date: Mon, 16 May 2016 13:20:01 -0700
Subject: [PATCH] Unbreak building in a separate object directory

Fix bitrot in building in a separate object directory.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
 Makefile.in          | 4 ++--
 Mkfiles/msvc.mak     | 2 +-
 Mkfiles/openwcom.mak | 2 +-
 Mkfiles/owlinux.mak  | 2 +-
 configure.in         | 2 +-
 rdoff/Makefile.in    | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 1479a626..13b10ce8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -22,7 +22,7 @@ INTERNAL_CFLAGS = -I$(srcdir) -I.
 ALL_CFLAGS	= $(BUILD_CFLAGS) $(INTERNAL_CFLAGS)
 LDFLAGS		= @LDFLAGS@
 LIBS		= @LIBS@
-PERL		= perl -I$(srcdir)/perllib
+PERL		= perl -I$(srcdir)/perllib -I$(srcdir)
 
 XOBJS		= @XOBJS@
 
@@ -113,7 +113,7 @@ ndisasm$(X): $(NDISASM) $(XOBJS)
 # instruction-table file by a Perl script. They're distributed,
 # though, so it isn't necessary to have Perl just to recompile NASM
 # from the distribution.
-INSDEP = insns.dat insns.pl insns-iflags.pl
+INSDEP = insns.dat insns.pl
 
 iflag.c: $(INSDEP)
 	$(PERL) $(srcdir)/insns.pl -fc $(srcdir)/insns.dat
diff --git a/Mkfiles/msvc.mak b/Mkfiles/msvc.mak
index 35dc9ead..e6c6c3e5 100644
--- a/Mkfiles/msvc.mak
+++ b/Mkfiles/msvc.mak
@@ -33,7 +33,7 @@ INTERNAL_CFLAGS = /I$(srcdir) /I. \
 ALL_CFLAGS	= $(BUILD_CFLAGS) $(INTERNAL_CFLAGS)
 LDFLAGS		= $(LDFLAGS) /SUBSYSTEM:CONSOLE
 LIBS		=
-PERL		= perl -I$(srcdir)/perllib
+PERL		= perl -I$(srcdir)/perllib -I$(srcdir)
 
 # Binary suffixes
 O               = obj
diff --git a/Mkfiles/openwcom.mak b/Mkfiles/openwcom.mak
index 3dffb117..b98bc321 100644
--- a/Mkfiles/openwcom.mak
+++ b/Mkfiles/openwcom.mak
@@ -22,7 +22,7 @@ LD      = *wlink
 LDEBUG      =
 LDFLAGS     = op quiet $(%TARGET_LFLAGS) $(LDEBUG)
 LIBS        =
-PERL        = perl -I$(srcdir)/perllib
+PERL        = perl -I$(srcdir)/perllib -I$(srcdir)
 
 STRIP       = wstrip
 
diff --git a/Mkfiles/owlinux.mak b/Mkfiles/owlinux.mak
index ad27d177..611f96d0 100644
--- a/Mkfiles/owlinux.mak
+++ b/Mkfiles/owlinux.mak
@@ -37,7 +37,7 @@ ALL_CFLAGS	= $(BUILD_CFLAGS) $(INTERNAL_CFLAGS)
 LD		= $(CC)
 LDFLAGS		= $(ALL_CFLAGS)
 LIBS		=
-PERL		= perl -I$(srcdir)/perllib
+PERL		= perl -I$(srcdir)/perllib -I$(srcdir)
 
 STRIP		= wstrip
 
diff --git a/configure.in b/configure.in
index cbaebc4a..56e0ce69 100644
--- a/configure.in
+++ b/configure.in
@@ -204,5 +204,5 @@ PA_ADD_CFLAGS([-Werror=missing-declarations])
 PA_ADD_CFLAGS([-Werror=comment])
 PA_ADD_CFLAGS([-Werror=vla])])
 
-AC_OUTPUT_COMMANDS([mkdir -p output])
+AC_OUTPUT_COMMANDS([mkdir -p lib nsis output])
 AC_OUTPUT(Makefile rdoff/Makefile doc/Makefile)
diff --git a/rdoff/Makefile.in b/rdoff/Makefile.in
index 41fc5f1a..e9081ce0 100644
--- a/rdoff/Makefile.in
+++ b/rdoff/Makefile.in
@@ -19,7 +19,7 @@ datarootdir	= @datarootdir@
 CC		= @CC@
 CFLAGS		= @CFLAGS@
 BUILD_CFLAGS	= $(CFLAGS) @DEFS@
-INTERNAL_CFLAGS = -I$(srcdir) -I$(top_srcdir)
+INTERNAL_CFLAGS = -I$(srcdir) -I$(top_srcdir) -I..
 ALL_CFLAGS	= $(BUILD_CFLAGS) $(INTERNAL_CFLAGS)
 LDFLAGS		= @LDFLAGS@