From 0c66b13fd137babc98e8a3277fb8ccfae2c65d36 Mon Sep 17 00:00:00 2001 From: William McBrine Date: Sun, 27 Aug 2006 07:27:25 +0000 Subject: [PATCH] Simpler include lines. --- x11/Makefile.aix.in | 7 +++---- x11/Makefile.in | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/x11/Makefile.aix.in b/x11/Makefile.aix.in index 139ca73d..733b855d 100644 --- a/x11/Makefile.aix.in +++ b/x11/Makefile.aix.in @@ -19,8 +19,8 @@ exec_prefix = @exec_prefix@ libdir = $(exec_prefix) includedir = @includedir@ -PDCURSES_HOME =$(srcdir)/.. -PDCURSES_CONFIG_H =../config.h +PDCURSES_HOME =$(osdir)/.. +PDCURSES_CONFIG_H =$(PDCURSES_HOME)/config.h PDCURSES_CURSES_H =$(PDCURSES_HOME)/curses.h PDCURSES_CURSPRIV_H =$(PDCURSES_HOME)/curspriv.h PDCURSES_HEADERS =$(PDCURSES_CONFIG_H) $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H) @@ -46,8 +46,7 @@ DYNAMIC_LDFLAGS = @DYNAMIC_LDFLAGS@ $(EEXTRA) CC = @CC@ CFLAGS = @CFLAGS@ $(DYN_COMP) -INCDIR = $(srcdir) -CPPFLAGS = -I$(INCDIR) -I$(srcdir)/.. -I.. @DEFS@ -DXCURSES @SYS_DEFS@ -I$(osdir) +CPPFLAGS = @DEFS@ -DXCURSES @SYS_DEFS@ -I$(PDCURSES_HOME) -I$(osdir) CCFLAGS = -c $(CFLAGS) $(CPPFLAGS) @MH_XINC_DIR@ diff --git a/x11/Makefile.in b/x11/Makefile.in index 31ebd8fa..0974a1a6 100644 --- a/x11/Makefile.in +++ b/x11/Makefile.in @@ -20,8 +20,8 @@ exec_prefix = @exec_prefix@ libdir = $(exec_prefix) includedir = @includedir@ -PDCURSES_HOME =$(srcdir)/.. -PDCURSES_CONFIG_H =../config.h +PDCURSES_HOME =$(osdir)/.. +PDCURSES_CONFIG_H =$(PDCURSES_HOME)/config.h PDCURSES_CURSES_H =$(PDCURSES_HOME)/curses.h PDCURSES_CURSPRIV_H =$(PDCURSES_HOME)/curspriv.h PDCURSES_HEADERS =$(PDCURSES_CONFIG_H) $(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H) @@ -45,7 +45,7 @@ DYNAMIC_LDFLAGS = @DYNAMIC_LDFLAGS@ $(EEXTRA) CC = @CC@ CFLAGS = @CFLAGS@ -CPPFLAGS = -I$(PDCURSES_HOME) -I$(srcdir) @DEFS@ -DXCURSES @SYS_DEFS@ -I$(osdir) +CPPFLAGS = @DEFS@ -DXCURSES @SYS_DEFS@ -I$(PDCURSES_HOME) -I$(osdir) CCFLAGS = -c $(CFLAGS) $(CPPFLAGS) @MH_XINC_DIR@