* configure.in, Make.common.in, doc/Makefile.in,

edit/Makefile.in, gnome/Makefile.in, gtkedit/Makefile.in,
slang/Makefile.in, src/Makefile.in, vfs/Make-mc.in: rootdir
changed to top_srcdir for Automake compatability

ChangeLog

@@ -1,4 +1,9 @@
-2000-09-13  Pavel Roskin  <proski@gnu.org>
+2000-09-14  Pavel Roskin  <proski@gnu.org>
+
+	* configure.in, Make.common.in, doc/Makefile.in,
+	edit/Makefile.in, gnome/Makefile.in, gtkedit/Makefile.in,
+	slang/Makefile.in, src/Makefile.in, vfs/Make-mc.in: rootdir
+	changed to top_srcdir for Automake compatability
 
 	* configure.in: REGEX_O variable removed - always use our regex
 

Make.common.in

@@ -40,8 +40,6 @@ manext     = 1
 man8dir    = $(mandir)/man8
 man8ext    = 8
 
-top_srcdir = $(rootdir)
-
 # Tools & program stuff
 MKINSTALLDIRS = @MKINSTALLDIRS@
 SEDCMD = @SEDCMD@
@@ -71,12 +69,12 @@ XLIBS = @LIBS@
 
 # Where do we have the sources?
 # You shouldn't have to edit this :)
-mcsrcdir    = $(rootdir)/src
+mcsrcdir    = $(top_srcdir)/src
-docdir      = $(rootdir)/doc
+docdir      = $(top_srcdir)/doc
-mcsrclibdir = $(rootdir)/lib
+mcsrclibdir = $(top_srcdir)/lib
-slangdir    = $(rootdir)/slang
+slangdir    = $(top_srcdir)/slang
-vfsdir      = $(rootdir)/vfs
+vfsdir      = $(top_srcdir)/vfs
-gnomedir    = $(rootdir)/gnome
+gnomedir    = $(top_srcdir)/gnome
 
 hpath = -I$(mcsrcdir) -I$(slangdir) -I$(vfsdir)
 

configure.in

@@ -936,7 +936,7 @@ AC_DEFUN(AC_WITH_EDIT, [
 	LIBEDIT_A="libedit.a"
 	MCEDIT="mcedit"
 	LEDIT="-ledit"
-	CPPFLAGS="$CPPFLAGS -I\$(rootdir)"
+	CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)"
 	EDIT_msg="yes"
 	AC_MSG_RESULT(will call internal editor)
 ])

doc/Makefile.in

@@ -1,7 +1,7 @@
 srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
-rootdir = $(srcdir)/..
 @MCFG@@MCF@
 
 #

edit/Makefile.in

@@ -1,7 +1,7 @@
 srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
-rootdir = $(srcdir)/..
 @MCFG@@MCF@
 
 CFLAGS = $(XCFLAGS)
@@ -37,17 +37,17 @@ check:
 	@echo no tests are supplied.
 
 checklinks:
-	@if test -f $(rootdir)/edit/edit.c; then echo ok; \
+	@if test -f $(top_srcdir)/edit/edit.c; then echo ok; \
 	else $(MAKE) sourcelinks; fi
-	@if test -f $(rootdir)/edit/bookmark.c; then echo ok; \
+	@if test -f $(top_srcdir)/edit/bookmark.c; then echo ok; \
 	else $(MAKE) sourcelinks; fi
 
 sourcelinks:
-	-cd $(rootdir)/edit ; $(LN_S) ../gtkedit/*.[ch] . >/dev/null 2>&1 ; true
+	-cd $(top_srcdir)/edit ; $(LN_S) ../gtkedit/*.[ch] . >/dev/null 2>&1 ; true
 
 cleansourcelinks:
-	-if test -f $(rootdir)/edit/edit.c; then \
+	-if test -f $(top_srcdir)/edit/edit.c; then \
-	    cd $(rootdir)/edit; find . -lname '*.[ch]' | xargs $(RM); \
+	    cd $(top_srcdir)/edit; find . -lname '*.[ch]' | xargs $(RM); \
 	fi
 
 libedit.a: checklinks

gnome/Makefile.in

@@ -1,13 +1,14 @@
 srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
-rootdir = $(srcdir)/..
+top_srcdir = $(srcdir)/..
 @MCFG@@MCF@
 
 GNOMEDEFS     = -DHAVE_X -DHAVE_GNOME @GNOME_INCLUDEDIR@
 
 #
-# Warning: Don't add `-I$(rootdir)/src' to CFLAGS -- it breaks compilation
+# Warning: Don't add `-I$(top_srcdir)/src' to CFLAGS -- it breaks compilation
 # on glibc2.1 systems because glibc includes src/features.h instead of it's
 # own features.h. Run `make cleansourcelinks; make sourcelinks'/modify targets
 # cleansourcelinks/sourclinks in case mc doesn't find it's include files.
@@ -215,8 +216,8 @@ CLIENTOBJS = 			\
 	FileManager-common.o
 
 
-$(CORBA_GENERATED): $(rootdir)/idl/FileManager.idl
+$(CORBA_GENERATED): $(top_srcdir)/idl/FileManager.idl
-	orbit-idl `gnome-config --cflags idl` $(rootdir)/idl/FileManager.idl
+	orbit-idl `gnome-config --cflags idl` $(top_srcdir)/idl/FileManager.idl
 
 $(MAGICDEV_GENERATED): $(srcdir)/magicdev.idl
 	orbit-idl `gnome-config --cflags idl` --noskels $(srcdir)/magicdev.idl

gtkedit/Makefile.in

@@ -1,7 +1,7 @@
 srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
-rootdir = $(srcdir)/..
 @MCFG@@MCF@
 
 CFLAGS = $(XCFLAGS)

slang/Makefile.in

@@ -1,7 +1,7 @@
 srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
-rootdir = $(srcdir)/..
 @MCFG@@MCF@
 
 CFLAGS = $(XCFLAGS)

src/Makefile.in

@@ -1,8 +1,8 @@
 srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
 SHELL   = @SHELL@
-rootdir = $(srcdir)/..
 @MCFG@@MCF@
 
 CFLAGS   = $(XCFLAGS) @MCCFLAGS@

vfs/Make-mc.in

@@ -3,9 +3,9 @@
 # x
 
 srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
-rootdir = $(srcdir)/..
 @MCFG@@MCF@
 
 CFLAGS   = $(XCFLAGS) -D_LARGEFILE64_SOURCE