* Make.common.in: Move all defines ...

* gnome/Makefile.in: ... here ...
* src/Makefile.in: ... and here.

ChangeLog

@@ -1,3 +1,9 @@
+2001-07-20  Pavel Roskin  <proski@gnu.org>
+
+	* Make.common.in: Move all defines ...
+	* gnome/Makefile.in: ... here ...
+	* src/Makefile.in: ... and here.
+
 2001-07-19  Pavel Roskin  <proski@gnu.org>
 
 	* configure.in: Don't check for getwd, it's completely

Make.common.in

@@ -38,12 +38,7 @@ AWK = @AWK@
 # No way, to make make happy (except GNU), we cannot use := to append
 # something to these, so that's why there is a leading _
 XCFLAGS = @CFLAGS@
-XCPPFLAGS = -I.. @CPPFLAGS@ @MCCPPFLAGS@ \
-	-DBINDIR=\""$(bindir)/"\" \
-	-DLIBDIR=\""$(mclibdir)/"\" \
-	-DLOCALEDIR=\""$(localedir)/"\" \
-	-DCONFDIR=\""$(confdir)/"\" \
-	@GLIB_CFLAGS@
+XCPPFLAGS = -I.. @CPPFLAGS@ @MCCPPFLAGS@ @GLIB_CFLAGS@
 XLDFLAGS = @LDFLAGS@
 XDEFS = @DEFS@
 XLIBS = @LIBS@

gnome/Makefile.in

@@ -15,7 +15,8 @@ icondir    = $(datadir)/pixmaps/mc
 
 GNOMEDEFS     = -DHAVE_X -DHAVE_GNOME -DICONDIR=\""$(icondir)/"\" \
 	-DDESKTOP_INIT_DIR=\""$(desktopdir)/"\" \
-	@GNOME_INCLUDEDIR@
+	-DCONFDIR=\""$(confdir)/"\" -DLOCALEDIR=\""$(localedir)/"\" \
+	-DLIBDIR=\""$(mclibdir)/"\" @GNOME_INCLUDEDIR@
 
 CFLAGS        = $(XCFLAGS)
 CPPFLAGS      = $(XCPPFLAGS) -I. -I$(gnomedir) -I$(mcsrcdir) $(GNOMEDEFS)

src/Makefile.in

@@ -8,9 +8,10 @@ SHELL   = @SHELL@
 @MCF@
 
 CFLAGS   = $(XCFLAGS)
-CPPFLAGS = $(XCPPFLAGS) @MCCFLAGS@ -DREGEX_MALLOC
+CPPFLAGS = $(XCPPFLAGS) @MCCFLAGS@
 LDFLAGS  = $(XLDFLAGS)
-DEFS     = $(XDEFS)
+DEFS     = $(XDEFS) -DREGEX_MALLOC -DLIBDIR=\""$(mclibdir)/"\" \
+	-DCONFDIR=\""$(confdir)/"\" -DLOCALEDIR=\""$(localedir)/"\"
 LIBS     = @LSLANG@ @LEDIT@ @LVFS@ @LINTL@ @LGPM@ \
 	$(XLIBS) $(XLIB) @TERMNET@ @MCLIBS@ @LIBICONV@
 DEPLIBS  = $(top_builddir)/vfs/@LIBVFS@ $(top_builddir)/slang/@LIBSLANG@ \