diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2016-05-16 21:24:26 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2016-05-16 21:27:33 -0700 |
| commit | a87c5e4c872b9a28f03b786b95c23d07696d1eaf (patch) | |
| tree | 5d7457a04ba30c68e63d7800a8411ef168672231 /rdoff | |
| parent | 2c9b6ad3d9da2e57e695fd4ae2d612bd83aecaf4 (diff) | |
| parent | acbf8f0e1972eb690c91c5bca5b8c1c960dde4b5 (diff) | |
| download | nasm-a87c5e4c872b9a28f03b786b95c23d07696d1eaf.tar.gz | |
Merge remote-tracking branch 'origin/nasm-2.12.xx'
Resolved Conflicts:
.gitignore
Makefile.in
Mkfiles/msvc.mak
Mkfiles/netware.mak
Mkfiles/openwcom.mak
Mkfiles/owlinux.mak
preproc-nop.c
preproc.c
version
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'rdoff')
| -rw-r--r-- | rdoff/Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rdoff/Makefile.in b/rdoff/Makefile.in index a461c24c..83d81c9b 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@ LIBS = @LIBS@ |