Fix null pointer deref that caused build failures on Solaris

[fw/sdcc] / Makefile.common.in

diff --git a/Makefile.common.in b/Makefile.common.in
index 52fa00254ed85bdf01c320221fbfbe90f6c70889..90d0edcbae3ed1190bfe8ec5fa5ab990691fd7b3 100644 (file)
--- a/Makefile.common.in
+++ b/Makefile.common.in
@@ -2,9 +2,6 @@
 #
 #
 
-# HACK
-PORT           = mcs51
-
 # Version
 VERSION         = @VERSION@
 VERSIONHI       = @VERSIONHI@
@@ -17,7 +14,7 @@ CC            = @CC@
 CPP            = @CPP@
 RANLIB         = @RANLIB@
 INSTALL                = @INSTALL@
-YACC            = @YACC@ 
+YACC            = @YACC@
 LEX             = @LEX@ 
 AWK             = @AWK@
 STRIP           = @STRIP@
@@ -32,7 +29,10 @@ man1dir         = $(mandir)/man1
 man2dir         = $(mandir)/man2
 infodir         = @infodir@
 srcdir          = @srcdir@
-docdir          = @datadir@/doc/sdcc
+docdir          = @docdir@
+
+include_dir_suffix = @include_dir_suffix@
+lib_dir_suffix     = @lib_dir_suffix@
 
 # Modules to enable/disable
 OPT_ENABLE_UCSIM = @OPT_ENABLE_UCSIM@
@@ -47,16 +47,16 @@ transform       = @program_transform_name@
 
 DEFS            = $(subs -DHAVE_CONFIG_H,,@DEFS@)
 CPPFLAGS        = $(INCLUDEFLAGS) -I. -I$(PRJDIR) -I$(SLIB)
-CFLAGS          = @CFLAGS@ -Wall
+CFLAGS          = -Wall @CFLAGS@
 M_OR_MM         = @M_OR_MM@
 
+EXTRALIBS      = @LIBS@
+
 # Shared settings between all the sub Makefiles
 # Done here so that we don't have to start a Make from the top levelport
 # directory.
 
 # Library compilation options
-SCC = $(PRJDIR)/src/sdcc
-SAS = $(PRJDIR)/as/$(PORT)/as
 CLEANSPEC = *.lst *.asm *.sym *~ *.cdb *.dep *.rul
 
 OBJ = $(SOURCES:.c=.o)