From ccfff63b1c33bbfb2870f7f38e5228b74a0a0bdf Mon Sep 17 00:00:00 2001
From: William McBrine <wmcbrine@gmail.com>
Date: Thu, 24 Nov 2005 00:56:41 +0000
Subject: [PATCH] Added a few more PDCURSES_SRCDIRs, and took out a few
 unneeded CC_HOMEs. More of these to do.

---
 dos/bccdos.mak      |  2 +-
 dos/gccdos.mak      | 14 ++------------
 os2/owos2.mak       |  2 +-
 os2/wccos2.mak      |  2 +-
 win32/mingwin32.mak | 10 +++-------
 5 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/dos/bccdos.mak b/dos/bccdos.mak
index 46648e8a..bdc2cf44 100644
--- a/dos/bccdos.mak
+++ b/dos/bccdos.mak
@@ -12,7 +12,7 @@
 # Change these for your environment...
 #
 ################################################################################
-PDCURSES_HOME		=c:\curses
+PDCURSES_HOME		=$(PDCURSES_SRCDIR)
 CC_HOME		=c:\c
 MODEL		=l
 ################################################################################
diff --git a/dos/gccdos.mak b/dos/gccdos.mak
index 603ce8d1..f90d44f9 100644
--- a/dos/gccdos.mak
+++ b/dos/gccdos.mak
@@ -13,17 +13,10 @@
 #
 # PDCURSES_HOME = .. works in the 'dos' directory except for 'dist' rule
 # PDC_HOME is the backslashed version of PDCURSES_HOME, generated automatically
-# CC_HOME should be set automatically if you are running DJGPP make
 #
 ################################################################################
-PDCURSES_HOME	= c:/projects/pdcurses
+PDCURSES_HOME	= $(PDCURSES_SRCDIR)
 PDC_HOME	= $(subst /,\,$(PDCURSES_HOME))
-
-ifdef DJDIR
-CC_HOME		= $(DJDIR)
-else
-CC_HOME		= c:/djgpp
-endif
 ################################################################################
 # Nothing below here should require changing.
 ################################################################################
@@ -35,9 +28,6 @@ PDCURSES_CURSPRIV_H	=$(PDCURSES_HOME)/curspriv.h
 PDCURSES_HEADERS	=$(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
 PANEL_HEADER		=$(PDCURSES_HOME)/panel.h
 
-CCLIBDIR		=$(CC_HOME)/lib
-CCINCDIR		=$(CC_HOME)/include
-
 srcdir		= $(PDCURSES_HOME)/pdcurses
 osdir		= $(PDCURSES_HOME)/dos
 pandir		= $(PDCURSES_HOME)/panel
@@ -53,7 +43,7 @@ else
 	LDFLAGS =
 endif
 
-CPPFLAGS	= -I$(PDCURSES_HOME) -I$(CCINCDIR) -D_NAIVE_DOS_REGS -funsigned-char
+CPPFLAGS	= -I$(PDCURSES_HOME) -D_NAIVE_DOS_REGS -funsigned-char
 
 CCFLAGS		= $(CFLAGS) $(CPPFLAGS)
 
diff --git a/os2/owos2.mak b/os2/owos2.mak
index 0e954b71..2e63bbf2 100644
--- a/os2/owos2.mak
+++ b/os2/owos2.mak
@@ -12,7 +12,7 @@
 # Change these for your environment...
 #
 ################################################################################
-PDCURSES_HOME		=c:\curses
+PDCURSES_HOME		=$(%PDCURSES_SRCDIR)
 CCINCDIR		=k:\h
 ################################################################################
 # Nothing below here should require changing.
diff --git a/os2/wccos2.mak b/os2/wccos2.mak
index c6900d8b..4ca44f6a 100644
--- a/os2/wccos2.mak
+++ b/os2/wccos2.mak
@@ -12,7 +12,7 @@
 # Change these for your environment...
 #
 ################################################################################
-PDCURSES_HOME		=c:\curses
+PDCURSES_HOME		=$(%PDCURSES_SRCDIR)
 CCINCDIR		=k:\h
 ################################################################################
 # Nothing below here should require changing.
diff --git a/win32/mingwin32.mak b/win32/mingwin32.mak
index 0361987b..a04855e4 100644
--- a/win32/mingwin32.mak
+++ b/win32/mingwin32.mak
@@ -12,8 +12,7 @@
 # Change these for your environment...
 #
 ################################################################################
-PDCURSES_HOME		=d:/pdcurses/pdcurses
-CC_HOME		=c:/mingw32
+PDCURSES_HOME		=$(PDCURSES_SRCDIR)
 ################################################################################
 # Nothing below here should require changing.
 ################################################################################
@@ -23,9 +22,6 @@ PDCURSES_CURSPRIV_H		=$(PDCURSES_HOME)/curspriv.h
 PDCURSES_HEADERS		=$(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
 PANEL_HEADER		=$(PDCURSES_HOME)/panel.h
 
-CCLIBDIR		=$(CC_HOME)/lib
-CCINCDIR		=$(CC_HOME)/include
-
 srcdir		= $(PDCURSES_HOME)/pdcurses
 osdir		= $(PDCURSES_HOME)/win32
 pandir		= $(PDCURSES_HOME)/panel
@@ -41,14 +37,14 @@ else
 	LDFLAGS =
 endif
 
-CPPFLAGS	= -I$(PDCURSES_HOME) -I$(CCINCDIR)
+CPPFLAGS	= -I$(PDCURSES_HOME)
 
 CCFLAGS		= $(CFLAGS) $(CPPFLAGS)
 
 LINK		= gcc
 COFF2EXE	=coff2exe $*
 
-CCLIBS		= -L$(CCLIBDIR) -lkernel32 -luser32
+CCLIBS		= -lkernel32 -luser32
 
 LIBEXE		= ar
 LIBFLAGS		=rcv