* Makefile.in, */Makefile.in: Fail if $(RMF) fails - it may

indicate serious problems. Fixes for uninstall. * doc/Makefile.in: Rebuild if it is out of date.
2024-12-22 12:32:40 +03:00 · 2000-08-15 16:56:33 +00:00 · 2000-08-15 16:56:33 +00:00 · 9ae68cd8bc
commit 9ae68cd8bc
parent 948bf68c7b
13 changed files with 69 additions and 53 deletions
--- a/4
+++ b/4
@ -1,5 +1,9 @@
 2000-08-15  Pavel Roskin  <proski@gnu.org>

+	* Makefile.in, */Makefile.in: Fail if $(RMF) fails - it may
+	indicate serious problems. Fixes for uninstall.
+	* doc/Makefile.in: Rebuild if it is out of date.
+
 	* lib/cedit.menu: Added. This file has been missing

 	* lib/Makefile.in: Install mc.sh and mc.csh in $(suppbindir) only
--- a/Makefile.in
+++ b/Makefile.in
@ -66,8 +66,8 @@ mcfninstall:

 uninstall:
 	@for I in $(unixdirs); do cd $$I; $(MAKE) $@ || exit 1; cd ..; done
-	-$(RMF) $(DESTDIR)$(mclibdir)/FAQ
-	-$(RMF) $(DESTDIR)$(suppbindir)/mcfn_install
+	$(RMF) $(DESTDIR)$(mclibdir)/FAQ
+	$(RMF) $(DESTDIR)$(suppbindir)/mcfn_install
 	-rmdir $(DESTDIR)$(suppbindir)
 	-rmdir $(DESTDIR)$(mclibdir)
 	@echo Midnight Commander uninstalled
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@ -12,19 +12,22 @@ DISTDOC =	Makefile.in LSM DEVEL FILES mc.sgml linuxdoc-sgml.diff \
 		mc.1.in mcedit.1.in mcserv.8.in
 LINUXDOCDIR =	/usr/local/linuxdoc-sgml

-all:
+all: Makefile
+
+Makefile: $(srcdir)/Makefile.in $(builddir)/config.status
+	cd $(builddir) && CONFIG_FILES=doc/Makefile CONFIG_HEADERS= $(SHELL) ./config.status

 install:
-	$(MKINSTALLDIRS) $(DESTDIR)/$(man1dir)
-	$(MKINSTALLDIRS) $(DESTDIR)/$(man8dir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(man1dir)
+	$(MKINSTALLDIRS) $(DESTDIR)$(man8dir)
 	-$(SEDCMD2) < mc.1 > $(DESTDIR)$(man1dir)/$(manprefix)mc.$(manext)
 	-$(SEDCMD2) < mcedit.1 > $(DESTDIR)$(man1dir)/$(manprefix)mcedit.$(manext)
 	-$(SEDCMD2) < mcserv.8 > $(DESTDIR)$(man8dir)/$(manprefix)mcserv.$(man8ext)

 uninstall:
-	-cd $(mandir); $(RMF) $(manprefix)mc.$(manext)
-	-cd $(mandir); $(RMF) $(manprefix)mcedit.$(manext)
-	-cd $(man8dir); $(RMF) $(manprefix)mcserv.$(man8ext)
+	$(RMF) $(DESTDIR)$(man1dir)/$(manprefix)mc.$(manext)
+	$(RMF) $(DESTDIR)$(man1dir)/$(manprefix)mcedit.$(manext)
+	$(RMF) $(DESTDIR)$(man8dir)/$(manprefix)mcserv.$(man8ext)

 check:
 	@echo no tests are supplied.
@ -75,7 +78,7 @@ clean:
 realclean:

 distclean:
-	-$(RMF) $(srcdir)/*~ $(srcdir)/Makefile $(srcdir)/*.1 $(srcdir)/*.8
+	$(RMF) $(srcdir)/*~ $(srcdir)/Makefile $(srcdir)/*.1 $(srcdir)/*.8

 distcopy:
 	for I in $(DISTDOC); do $(CP) $(top_srcdir)/doc/$$I $(top_srcdir)/mc-$(VERSION)/doc; done
--- a/edit/Makefile.in
+++ b/edit/Makefile.in
@ -57,7 +57,7 @@ mx: $(EDITOBJS)
 	-$(RANLIB) libedit.a

 mcedit:
-	-$(RMF) $(DESTDIR)$(bindir)/$(binprefix)mcedit
+	$(RMF) $(DESTDIR)$(bindir)/$(binprefix)mcedit
 	$(LN_S) mc $(DESTDIR)$(bindir)/$(binprefix)mcedit

 showlibdep:
@ -79,15 +79,15 @@ realclean: clean
 	$(RMF) *~

 distclean: cleansourcelinks
-	-$(RMF) $(srcdir)/*~ $(srcdir)/*.o $(srcdir)/a.out
-	-$(RMF) $(srcdir)/core $(srcdir)/libedit.a
+	$(RMF) $(srcdir)/*~ $(srcdir)/*.o $(srcdir)/a.out
+	$(RMF) $(srcdir)/core $(srcdir)/libedit.a
 	-if test $(srcdir) = .; then $(MAKE) realclean; fi
-	-$(RMF) $(srcdir)/Makefile
+	$(RMF) $(srcdir)/Makefile

 install: @MCEDIT@

 uninstall:
-	-$(RMF) $(DESTDIR)$(bindir)/$(binprefix)mcedit
+	$(RMF) $(DESTDIR)$(bindir)/$(binprefix)mcedit

 distcopy:
 	for I in $(DIST); do $(CP) $(top_srcdir)/edit/$$I $(top_srcdir)/mc-$(VERSION)/edit; done
--- a/gnome/Makefile.in
+++ b/gnome/Makefile.in
@ -281,12 +281,12 @@ mc.keys.in: mc.keys.in.in Makefile.in ../config.status

@LIBVFS@:
 	cd ../vfs; $(MAKE) @LIBVFS@
-@PCENTRULE@	-$(RMF) @LIBVFS@
+@PCENTRULE@	$(RMF) @LIBVFS@
@PCENTRULE@	$(LN_S) ../vfs/@LIBVFS@ .

 libgtkedit.a:
 	cd ../gtkedit; $(MAKE) libgtkedit.a
-@PCENTRULE@	-$(RMF) libgtkedit.a
+@PCENTRULE@	$(RMF) libgtkedit.a
@PCENTRULE@	$(LN_S) ../gtkedit/libgtkedit.a .

 checklinks:
@ -320,10 +320,10 @@ realclean: clean
 	$(RMF) *~

 distclean: cleansourcelinks
-	-$(RMF) $(srcdir)/*~ $(srcdir)/*.o $(srcdir)/gmc $(srcdir)/core
-	-$(RMF) $(srcdir)/a.out
+	$(RMF) $(srcdir)/*~ $(srcdir)/*.o $(srcdir)/gmc $(srcdir)/core
+	$(RMF) $(srcdir)/a.out
 	-if test $(srcdir) = .; then $(MAKE) realclean; fi
-	-$(RMF) $(srcdir)/Makefile
+	$(RMF) $(srcdir)/Makefile

 distcopy:
 	for I in $(DISTGNOME); do $(CP) $(top_srcdir)/gnome/$$I $(top_srcdir)/mc-$(VERSION)/gnome; done
@ -349,15 +349,18 @@ install_mx: all
 	$(INSTALL_DATA) $(srcdir)/gmc.gnorba $(DESTDIR)$(corbadir)

 uninstall:
-	-$(RMF) $(DESTDIR)$(bindir)/$(binprefix)gmc
-	-$(RMF) $(DESTDIR)$(bindir)/$(binprefix)corba-gmc
+	$(RMF) $(DESTDIR)$(bindir)/$(binprefix)gmc
+	$(RMF) $(DESTDIR)$(bindir)/$(binprefix)gmc-client
+	$(RMF) $(DESTDIR)$(bindir)/$(binprefix)plain-gmc
 	for I in $(ICONS); \
 	do $(RMF) $(DESTDIR)$(icondir)/$$I; done
 	-rmdir $(DESTDIR)$(icondir)
-	-$(RMF) $(DESTDIR)$(mclibdir)/layout
-	-$(RMF) $(DESTDIR)$(datadir)/mime-info/mc.keys
+	$(RMF) $(DESTDIR)$(mclibdir)/layout
+	$(RMF) $(DESTDIR)$(datadir)/mime-info/mc.keys
 	-rmdir $(DESTDIR)$(datadir)/mime-info
-	-$(RMF) $(gnewdir)
+	-rmdir $(DESTDIR)$(gnewdir)
+	$(RMF) $(DESTDIR)$(corbadir)/gmc.gnorba
+	-rmdir $(DESTDIR)$(corbadir)

 depend dep: @gmcdep@

--- a/gtkedit/Makefile.in
+++ b/gtkedit/Makefile.in
@ -42,7 +42,7 @@ libgtkedit.a: $(EDITOBJS)
 	-$(RANLIB) $@

 mcedit:
-	-$(RMF) $(DESTDIR)$(bindir)/$(binprefix)mcedit
+	$(RMF) $(DESTDIR)$(bindir)/$(binprefix)mcedit
 	$(LN_S) mc $(DESTDIR)$(bindir)/$(binprefix)mcedit

 showlibdep:
@ -64,15 +64,15 @@ realclean: clean
 	$(RMF) *~

 distclean:
-	-$(RMF) $(srcdir)/*~ $(srcdir)/*.o $(srcdir)/a.out
-	-$(RMF) $(srcdir)/core $(srcdir)/libgtkedit.a
+	$(RMF) $(srcdir)/*~ $(srcdir)/*.o $(srcdir)/a.out
+	$(RMF) $(srcdir)/core $(srcdir)/libgtkedit.a
 	-if test $(srcdir) = .; then $(MAKE) realclean; fi
-	-$(RMF) $(srcdir)/Makefile
+	$(RMF) $(srcdir)/Makefile

 install: @MCEDIT@

 uninstall:
-	-$(RMF) $(DESTDIR)$(bindir)/$(binprefix)mcedit
+	$(RMF) $(DESTDIR)$(bindir)/$(binprefix)mcedit

 distcopy:
 	for I in $(DIST); do $(CP) $(top_srcdir)/gtkedit/$$I $(top_srcdir)/mc-$(VERSION)/gtkedit; done
--- a/icons/Makefile.in
+++ b/icons/Makefile.in
@ -64,7 +64,7 @@ clean:
 realclean:

 distclean:
-	-$(RMF) $(srcdir)/*~ $(srcdir)/Makefile
+	$(RMF) $(srcdir)/*~ $(srcdir)/Makefile

 distcopy:
 	for I in $(DISTICONS); do $(CP) $(top_srcdir)/icons/$$I $(top_srcdir)/mc-$(VERSION)/icons; done
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@ -62,7 +62,7 @@ install:
 	for I in $(LIBFILES_OUT); \
 	do $(INSTALL_DATA) $(builddir)/lib/$$I $(DESTDIR)$(mclibdir)/$$I; done
 	for I in $(SUPPBIN_OUT); \
-	do $(INSTALL_PROGRAM) -m 755 $(builddir)/lib/$$I $(DESTDIR)$(suppbindir)//$$I; done
+	do $(INSTALL_PROGRAM) -m 755 $(builddir)/lib/$$I $(DESTDIR)$(suppbindir)/$$I; done
 	for I in $(TIFILES); \
 	do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(tidir)/$$I; done
 	$(MKINSTALLDIRS) $(DESTDIR)$(confdir)
@ -74,8 +74,14 @@ install:
 uninstall:
 	for I in $(LIBFILES_OUT) $(LIBFILES_CONST); \
 	do $(RMF) $(DESTDIR)$(mclibdir)/$$I; done
+	for I in $(SUPPBIN_OUT); \
+	do $(RMF) $(DESTDIR)$(suppbindir)/$$I; done
+	for I in $(DESKTOP_FILES); \
+	do $(RMF) $(DESTDIR)$(desktopdir)/$$I; done
 	for I in $(TIFILES); \
 	do $(RMF) $(DESTDIR)$(tidir)/$$I; done
+	$(RMF) $(DESTDIR)$(confdir)/mc.global
+	-rmdir $(DESTDIR)$(desktopdir)
 	-rmdir $(DESTDIR)$(tidir)
 	-rmdir $(DESTDIR)$(mclibdir)

--- a/new_icons/Makefile.in
+++ b/new_icons/Makefile.in
@ -121,7 +121,7 @@ clean:
 realclean:

 distclean:
-	-$(RMF) $(srcdir)/*~ $(srcdir)/Makefile
+	$(RMF) $(srcdir)/*~ $(srcdir)/Makefile

 distcopy:
 	for I in $(DISTICONS); do $(CP) $(top_srcdir)/new_icons/$$I $(top_srcdir)/mc-$(VERSION)/new_icons; done
--- a/slang/Makefile.in
+++ b/slang/Makefile.in
@ -59,10 +59,10 @@ realclean: clean
 	$(RMF) *~

 distclean:
-	-$(RMF) $(srcdir)/*~ $(srcdir)/*.o $(srcdir)/core $(srcdir)/a.out
-	-$(RMF) $(srcdir)/libmcslang.a 
+	$(RMF) $(srcdir)/*~ $(srcdir)/*.o $(srcdir)/core $(srcdir)/a.out
+	$(RMF) $(srcdir)/libmcslang.a 
 	-if test $(srcdir) = .; then $(MAKE) realclean; fi
-	-$(RMF) $(srcdir)/Makefile
+	$(RMF) $(srcdir)/Makefile

 distcopy: 
 	for I in $(DISTSLANG); do $(CP) $(top_srcdir)/slang/$$I $(top_srcdir)/mc-$(VERSION)/slang; done
--- a/src/Makefile.in
+++ b/src/Makefile.in
@ -82,17 +82,17 @@ mcmfmt: mfmt.o

 libvfs-mc.a:
 	cd ../vfs; $(MAKE) libvfs-mc.a
-@PCENTRULE@	-$(RMF) libvfs-mc.a
+@PCENTRULE@	$(RMF) libvfs-mc.a
@PCENTRULE@	$(LN_S) ../vfs/libvfs-mc.a .

 libmcslang.a:
 	cd ../slang; $(MAKE) libmcslang.a
-@PCENTRULE@	-$(RMF) libmcslang.a
+@PCENTRULE@	$(RMF) libmcslang.a
@PCENTRULE@	$(LN_S) ../slang/libmcslang.a .

 libedit.a:
 	cd ../edit; $(MAKE) libedit.a
-@PCENTRULE@	-$(RMF) libedit.a
+@PCENTRULE@	$(RMF) libedit.a
@PCENTRULE@	$(LN_S) ../edit/libedit.a .

 $(srcdir)/mc.hlp: $(docdir)/mc.1.in $(mcsrclibdir)/xnc.hlp $(srcdir)/gindex.pl
@ -118,12 +118,12 @@ realclean: clean
 	$(RMF) *~

 distclean:
-	-$(RMF) $(srcdir)/*~ $(srcdir)/mc $(srcdir)/cons.saver
-	-$(RMF) $(srcdir)/man2hlp $(srcdir)/fixhlp $(srcdir)/*.o $(srcdir)/core
-	-$(RMF) $(srcdir)/a.out $(srcdir)/mc.html
-	-$(RMF) $(srcdir)/libvfs-mc.a $(srcdir)/libmcslang.a $(srcdir)/libedit.a
+	$(RMF) $(srcdir)/*~ $(srcdir)/mc $(srcdir)/cons.saver
+	$(RMF) $(srcdir)/man2hlp $(srcdir)/fixhlp $(srcdir)/*.o $(srcdir)/core
+	$(RMF) $(srcdir)/a.out $(srcdir)/mc.html
+	$(RMF) $(srcdir)/libvfs-mc.a $(srcdir)/libmcslang.a $(srcdir)/libedit.a
 	-if test $(srcdir) = .; then $(MAKE) realclean; fi
-	-$(RMF) $(srcdir)/Makefile
+	$(RMF) $(srcdir)/Makefile

 install: mc mcmfmt @saver@
 	$(INSTALL_PROGRAM) mc     $(DESTDIR)$(bindir)/$(binprefix)mc
@ -134,10 +134,10 @@ install.saver: cons.saver
 	$(INSTALL_PROGRAM) -m 4755 cons.saver $(DESTDIR)$(suppbindir)/cons.saver

 uninstall:
-	$(RMF) $(bindir)/$(binprefix)mc
-	$(RMF) $(bindir)/$(binprefix)mcmfmt
-	$(RMF) $(bindir)/$(binprefix)cons.saver
-	$(RMF) $(mclibdir)/$(libprefix)mc.hlp
+	$(RMF) $(DESTDIR)$(bindir)/$(binprefix)/mc
+	$(RMF) $(DESTDIR)$(bindir)/$(binprefix)/mcmfmt
+	$(RMF) $(DESTDIR)$(suppbindir)/cons.saver
+	$(RMF) $(DESTDIR)$(mclibdir)/$(libprefix)/mc.hlp

 distcopy: $(srcdir)/mc.hlp
 	for I in $(DISTFILES); do $(CP) $(top_srcdir)/src/$$I $(top_srcdir)/mc-$(VERSION)/src; done
--- a/syntax/Makefile.in
+++ b/syntax/Makefile.in
@ -63,7 +63,7 @@ clean:
 realclean:

 distclean:
-	-$(RMF) $(srcdir)/*~ $(srcdir)/Makefile
+	$(RMF) $(srcdir)/*~ $(srcdir)/Makefile

 distcopy:
 	for I in $(DISTSYNTAX); do $(CP) $(top_srcdir)/syntax/$$I $(top_srcdir)/mc-$(VERSION)/syntax; done
--- a/vfs/Make-mc.in
+++ b/vfs/Make-mc.in
@ -327,14 +327,14 @@ realclean: clean
 	$(RMF) *~

 distclean:
-	-$(RMF) $(srcdir)/*~ $(srcdir)/mcserv $(srcdir)/*.o $(srcdir)/a.out
-	-$(RMF) $(srcdir)/core $(srcdir)/libvfs-mc.a $(srcdir)/libvfs.so
-	-$(RMF) $(srcdir)/mad.c $(srcdir)/mad.h
+	$(RMF) $(srcdir)/*~ $(srcdir)/mcserv $(srcdir)/*.o $(srcdir)/a.out
+	$(RMF) $(srcdir)/core $(srcdir)/libvfs-mc.a $(srcdir)/libvfs.so
+	$(RMF) $(srcdir)/mad.c $(srcdir)/mad.h
 	for I in $(EXTFS_OUT) ; do \
 	    $(RMF) $(builddir)/vfs/extfs/$$I; \
 	done
 	-if test $(srcdir) = .; then $(MAKE) realclean; fi
-	-$(RMF) $(srcdir)/Makefile
+	$(RMF) $(srcdir)/Makefile

 install: @mcserv@ install.extfs
 	-(if test x@mcserv@ != x; then \
@ -363,7 +363,7 @@ uninstall:
 	    $(RMF) $(DESTDIR)$(extfsdir)/$$I; \
 	done
 	-rmdir $(DESTDIR)$(extfsdir)
-	-$(RMF) $(DESTDIR)$(bindir)/$(binprefix)mcserv
+	$(RMF) $(DESTDIR)$(bindir)/$(binprefix)mcserv

 distcopy:
 	for I in $(DISTVFS); do $(CP) $(top_srcdir)/vfs/$$I $(top_srcdir)/mc-$(VERSION)/vfs; done