* edit/Makefile.in: Don't install or uninstall mcedit -

it cannot be installed before mc on systems without symlinks.
* gtkedit/Makefile.in: Likewise.
* src/Makefile.in: Install mcedit (if enabled) and mcview.
Uninstall them.
This commit is contained in:
Pavel Roskin 2001-01-11 16:48:13 +00:00
parent 9675636394
commit d1fcdbf64a
4 changed files with 28 additions and 5 deletions

View File

@ -1,6 +1,12 @@
2001-01-11 Pavel Roskin <proski@gnu.org> 2001-01-11 Pavel Roskin <proski@gnu.org>
* macros/gnome-gettext.m4: Propagateg change by Owen Taylor * edit/Makefile.in: Don't install or uninstall mcedit -
it cannot be installed before mc on systems without symlinks.
* gtkedit/Makefile.in: Likewise.
* src/Makefile.in: Install mcedit (if enabled) and mcview.
Uninstall them.
* macros/gnome-gettext.m4: Propagated change by Owen Taylor
from acinclude.m4 in gtk+: from acinclude.m4 in gtk+:
Don't define ENABLE_NLS unless we have a working NLS. Don't define ENABLE_NLS unless we have a working NLS.
(This should keep libintl.h from being included when it doesn't (This should keep libintl.h from being included when it doesn't

View File

@ -75,10 +75,9 @@ distclean: clean
rm -f *~ rm -f *~
rm -f Makefile rm -f Makefile
install: @MCEDIT@ install:
uninstall: uninstall:
rm -f $(DESTDIR)$(bindir)/$(binprefix)mcedit
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)

View File

@ -68,10 +68,9 @@ distclean: clean
rm -f *~ rm -f *~
rm -f Makefile rm -f Makefile
install: @MCEDIT@ install:
uninstall: uninstall:
rm -f $(DESTDIR)$(bindir)/$(binprefix)mcedit
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)

View File

@ -110,10 +110,27 @@ distclean: clean
rm -f *~ rm -f *~
rm -f Makefile rm -f Makefile
#
# Make sure to install mcview and mcedit after mc - important
# on systems without symlinks.
#
install: mc mcmfmt @saver@ install: mc mcmfmt @saver@
$(INSTALL_PROGRAM) mc $(DESTDIR)$(bindir)/$(binprefix)mc $(INSTALL_PROGRAM) mc $(DESTDIR)$(bindir)/$(binprefix)mc
$(INSTALL_PROGRAM) mcmfmt $(DESTDIR)$(bindir)/$(binprefix)mcmfmt $(INSTALL_PROGRAM) mcmfmt $(DESTDIR)$(bindir)/$(binprefix)mcmfmt
$(SEDCMD2) < $(srcdir)/mc.hlp > $(DESTDIR)$(mclibdir)/$(libprefix)mc.hlp $(SEDCMD2) < $(srcdir)/mc.hlp > $(DESTDIR)$(mclibdir)/$(libprefix)mc.hlp
$(MAKE) install_mcview
$(MAKE) install_@MCEDIT@
install_:
#
# Make relative symlinks, but do the right thing if LN_S is `ln' or `cp'.
#
install_mcview:
cd $(DESTDIR)$(bindir)/$(binprefix) && rm -f mcview && $(LN_S) mc mcview
install_mcedit:
cd $(DESTDIR)$(bindir)/$(binprefix) && rm -f mcedit && $(LN_S) mc mcedit
install.saver: cons.saver install.saver: cons.saver
$(INSTALL_PROGRAM) -m 4755 cons.saver $(DESTDIR)$(suppbindir)/cons.saver $(INSTALL_PROGRAM) -m 4755 cons.saver $(DESTDIR)$(suppbindir)/cons.saver
@ -123,6 +140,8 @@ uninstall:
rm -f $(DESTDIR)$(bindir)/$(binprefix)/mcmfmt rm -f $(DESTDIR)$(bindir)/$(binprefix)/mcmfmt
rm -f $(DESTDIR)$(suppbindir)/cons.saver rm -f $(DESTDIR)$(suppbindir)/cons.saver
rm -f $(DESTDIR)$(mclibdir)/$(libprefix)/mc.hlp rm -f $(DESTDIR)$(mclibdir)/$(libprefix)/mc.hlp
rm -f $(DESTDIR)$(bindir)/$(binprefix)mcedit
rm -f $(DESTDIR)$(bindir)/$(binprefix)mcview
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)