mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* configure.in: Simplified handling of cons.saver. 

* src/Makefile.in: Likewise. Don't install cons.saver setuid.
* mc.spec.in: Remove a workaround for the above.
This commit is contained in:
Pavel Roskin 2001-01-13 07:24:13 +00:00
parent 150920afc6
commit c5404ae9cb
4 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2001-01-13 Pavel Roskin <proski@gnu.org> 2001-01-13 Pavel Roskin <proski@gnu.org>
* configure.in: Simplified handling of cons.saver.
* src/Makefile.in: Likewise. Don't install cons.saver setuid.
* mc.spec.in: Remove a workaround for the above.
* configure.in: Use AC_CANONICAL_HOST - "target" is meaningless * configure.in: Use AC_CANONICAL_HOST - "target" is meaningless
for MC. Don't rely on the output of uname - use $host_os. for MC. Don't rely on the output of uname - use $host_os.

12
configure.in
View File

@ -870,16 +870,12 @@ fi
dnl dnl
dnl The variables used for expanding the auto saver. dnl The variables used for expanding the auto saver.
dnl dnl
saver="" cons_saver=""
saver_target=""
vcs=""
install_saver="no" install_saver="no"
PAMLIBS="" PAMLIBS=""
case $host_os in case $host_os in
linux*) linux*)
saver="install.saver" cons_saver="cons.saver"
saver_target="cons.saver"
vcs="install.create_vcs"
install_saver="yes" install_saver="yes"
dnl dnl
@ -891,9 +887,7 @@ linux*)
],[],[-ldl]) ],[],[-ldl])
;; ;;
esac esac
AC_SUBST(saver_target) AC_SUBST(cons_saver)
AC_SUBST(saver)
AC_SUBST(vcs)
AC_SUBST(PAMLIBS) AC_SUBST(PAMLIBS)
dnl dnl

3
mc.spec.in
View File

@ -82,9 +82,6 @@ install -m 644 lib/mcserv.pamd $RPM_BUILD_ROOT/etc/pam.d/mcserv
install lib/{mc.sh,mc.csh} $RPM_BUILD_ROOT/etc/profile.d install lib/{mc.sh,mc.csh} $RPM_BUILD_ROOT/etc/profile.d
# clean up this setuid problem for now
chmod 755 $RPM_BUILD_ROOT%{prefix}/lib/mc/bin/cons.saver
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT

10
src/Makefile.in
View File

@ -59,7 +59,7 @@ DISTFILES = \
$(HDRS) $(SRCS) Makefile.in TODO ChangeLog OChangeLog man2hlp.c \ $(HDRS) $(SRCS) Makefile.in TODO ChangeLog OChangeLog man2hlp.c \
gindex.pl cons.saver.c ncurses.patch mc.hlp depend.awk mfmt.c gindex.pl cons.saver.c ncurses.patch mc.hlp depend.awk mfmt.c
all: mc mcmfmt $(srcdir)/mc.hlp @saver_target@ Makefile all: mc mcmfmt $(srcdir)/mc.hlp @cons_saver@ Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && CONFIG_FILES=src/Makefile CONFIG_HEADERS= $(SHELL) ./config.status cd $(top_builddir) && CONFIG_FILES=src/Makefile CONFIG_HEADERS= $(SHELL) ./config.status
@ -114,7 +114,7 @@ distclean: clean
# Make sure to install mcview and mcedit after mc - important # Make sure to install mcview and mcedit after mc - important
# on systems without symlinks. # on systems without symlinks.
# #
install: mc mcmfmt @saver@ install: mc mcmfmt
$(mkinstalldirs) $(DESTDIR)$(bindir) $(mkinstalldirs) $(DESTDIR)$(bindir)
$(mkinstalldirs) $(DESTDIR)$(mclibdir) $(mkinstalldirs) $(DESTDIR)$(mclibdir)
$(INSTALL_PROGRAM) mc $(DESTDIR)$(bindir)/$(binprefix)mc $(INSTALL_PROGRAM) mc $(DESTDIR)$(bindir)/$(binprefix)mc
@ -122,6 +122,7 @@ install: mc mcmfmt @saver@
$(SEDCMD2) < $(srcdir)/mc.hlp > $(DESTDIR)$(mclibdir)/mc.hlp $(SEDCMD2) < $(srcdir)/mc.hlp > $(DESTDIR)$(mclibdir)/mc.hlp
$(MAKE) install_mcview $(MAKE) install_mcview
$(MAKE) install_@MCEDIT@ $(MAKE) install_@MCEDIT@
$(MAKE) install_@cons_saver@
install_: install_:
@ -134,8 +135,9 @@ install_mcview:
install_mcedit: install_mcedit:
cd $(DESTDIR)$(bindir)/$(binprefix) && rm -f mcedit && $(LN_S) mc mcedit cd $(DESTDIR)$(bindir)/$(binprefix) && rm -f mcedit && $(LN_S) mc mcedit
install.saver: cons.saver install_cons.saver: cons.saver
$(INSTALL_PROGRAM) -m 4755 cons.saver $(DESTDIR)$(suppbindir)/cons.saver $(mkinstalldirs) $(DESTDIR)$(suppbindir)
$(INSTALL_PROGRAM) cons.saver $(DESTDIR)$(suppbindir)/cons.saver
uninstall: uninstall:
rm -f $(DESTDIR)$(bindir)/$(binprefix)/mc rm -f $(DESTDIR)$(bindir)/$(binprefix)/mc