From 07d28f67ca056ff11c2781f0768ef0609772d70b Mon Sep 17 00:00:00 2001
From: Miguel de Icaza <miguel@novell.com>
Date: Wed, 16 Dec 1998 03:44:31 +0000
Subject: [PATCH] More stuff :-)

---
 Makefile.in       |  5 ++++-
 gnome/.cvsignore  |  2 ++
 gnome/Makefile.in | 16 ++--------------
 lib/.cvsignore    |  1 +
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index ec89bdd81..08e0a65d4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -5,7 +5,7 @@ rootdir = $(srcdir)
 @MCFGR@@MCF@
 
 foreigndirs=pc
-codedirs=vfs lib doc slang gtkedit src gnome new_icons icons idl
+codedirs=vfs lib doc slang gtkedit edit src gnome new_icons icons idl
 unixdirs=intl $(codedirs) @POSUB@
 alldirs=$(unixdirs) $(foreigndirs) 
 subdirs=$(alldirs)
@@ -36,6 +36,7 @@ configure: configure.in aclocal.m4
 
 GNOME_M4_FILES = macros/gnome.m4 macros/gnome-vfs.m4 macros/gnome-undelfs.m4 \
 	macros/linger.m4
+
 aclocal.m4: mc-aclocal.m4 $(GNOME_M4_FILES) gettext.m4
 	cd $(srcdir); cat $(GNOME_M4_FILES) mc-aclocal.m4 gettext.m4 > aclocal.m4
 
@@ -109,6 +110,8 @@ distcopy:
 	    cd $$I ; \
 	    $(MAKE) distcopy VERSION=$(VERSION) PACKAGE=mc || exit 1; \
 	    cd ..; done
+	mkdir ../mc-$(VERSION)/macros
+	cp $(GNOME_M4_FILES) ../mc-$(VERSION)/macros
 	cd po; $(MAKE) || exit 1; cd ..;
 	cp po/Makefile.in.in ../mc-$(VERSION)/po;
 	cp po/POTFILES.in ../mc-$(VERSION)/po;
diff --git a/gnome/.cvsignore b/gnome/.cvsignore
index f442cafed..c2d4e2b93 100644
--- a/gnome/.cvsignore
+++ b/gnome/.cvsignore
@@ -4,3 +4,5 @@ Makefile
 .depend
 mc.metadata
 image.metadata
+mc.keys.in
+mc.keys
diff --git a/gnome/Makefile.in b/gnome/Makefile.in
index 64a766725..177619ba0 100644
--- a/gnome/Makefile.in
+++ b/gnome/Makefile.in
@@ -175,7 +175,7 @@ DISTGNOME = \
 main-corba.o: main.c
 	$(CC) -c -DHAVE_CORBA $(CPPFLAGS) $(DEFS) $(CFLAGS) $< -o main-corba.o
 
-all: @gmc@ Makefile mc.metadata mc.keys image.metadata
+all: @gmc@ Makefile mc.keys 
 
 Makefile: Makefile.in ../config.status
 	(cd ..; CONFIG_FILES=gnome/Makefile CONFIG_HEADERS= ./config.status)
@@ -190,16 +190,8 @@ mx: @LIBVFS@ $(OBJS) $(NORMALOBJS) @LIBSLANG@ libgtkedit.a
 corba-gmc: @LIBVFS@ $(OBJS) $(CORBAOBJS) @LIBSLANG@ libgtkedit.a
 	$(CC) $(CORBA_LDFLAGS) -o corba-gmc $(CORBAOBJS) $(OBJS) -L../vfs -L../slang -L../gtkedit $(EXTRALIBS) $(LIBS) 
 
-mc.metadata: mc.metadata.in Makefile
-	sed -e 's^\@icondir\@^$(icondir)^g' < $(srcdir)/mc.metadata.in > mc.metadata.tmp \
-	&& mv mc.metadata.tmp mc.metadata 
-
-image.metadata: image.metadata.in Makefile
-	sed -e 's^\@icondir\@^$(icondir)^g' < $(srcdir)/image.metadata.in > image.metadata.tmp \
-	&& mv image.metadata.tmp image.metadata 
-
 mc.keys: mc.keys.in Makefile
-	sed -e 's^\@icondir\@^$(icondir)^g' < $(srcdir)/mc.keys.in > mc.keys.tmp \
+	sed -e 's^\@icondir\@^$(icondir)^g' < mc.keys.in > mc.keys.tmp \
 	&& mv mc.keys.tmp mc.keys 
 
 mc.keys.in: mc.keys.in.in Makefile.in ../config.status
@@ -272,11 +264,7 @@ install_gmc: all
 	for I in $(ICONS); \
 	do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(icondir)/$$I; done
 	$(INSTALL_DATA) $(srcdir)/layout $(DESTDIR)$(libdir)/layout
-	if [ -f $(DESTDIR)$(datadir)/metadata ]; then rm $(DESTDIR)$(datadir)/metadata; fi
-	$(mcsrcdir)/xmkdir $(DESTDIR)$(datadir)/metadata
 	$(mcsrcdir)/xmkdir $(DESTDIR)$(datadir)/mime-info
-	$(INSTALL_DATA) mc.metadata $(DESTDIR)$(datadir)/metadata
-	$(INSTALL_DATA) image.metadata $(DESTDIR)$(datadir)/metadata
 	$(INSTALL_DATA) mc.keys $(DESTDIR)$(datadir)/mime-info
 
 uninstall: 
diff --git a/lib/.cvsignore b/lib/.cvsignore
index 295336055..05f9ee711 100644
--- a/lib/.cvsignore
+++ b/lib/.cvsignore
@@ -1,2 +1,3 @@
 Makefile
 mc.ext
+mc-gnome.ext