Fri Mar 26 19:16:38 1999 Timur Bakeyev <mc@bat.ru>
* */Makefie.*: fixed several missed conversions from libdir to mclibdir. (Should be automake'd, really)
Этот коммит содержится в:
Timur Bakeyev
родитель
dcc0db3737
Коммит
188d414612
@ -1,3 +1,8 @@
|
||||
Fri Mar 26 19:16:38 1999 Timur Bakeyev <mc@bat.ru>
|
||||
|
||||
* */Makefie.*: fixed several missed conversions from libdir to
|
||||
mclibdir. (Should be automake'd, really)
|
||||
|
||||
1999-03-24 Federico Mena Quintero <federico@nuclecu.unam.mx>
|
||||
|
||||
* Make.common.in: There were conflicting definitions of mclibdir
|
||||
@ -6,7 +11,7 @@
|
||||
|
||||
* doc/Makefile.in: Use mcsrclibdir where appropriate.
|
||||
|
||||
on Mar 22 03:00:15 1999 Timur Bakeyev <mc@bat.ru>
|
||||
Mon Mar 22 03:00:15 1999 Timur Bakeyev <mc@bat.ru>
|
||||
|
||||
* edit/syntax.c: Remove extra "|" in "file ..\*\\.(pp|PP|pas|PAS|)$ \
|
||||
Pascal Program" (Heh, second time :)
|
||||
|
||||
@ -5,7 +5,7 @@ SHELL = @SHELL@
|
||||
# This variable makes it possible to move the installation root to another
|
||||
# directory. This is useful when you're creating a binary distribution of mc.
|
||||
# If empty, normal root will be used.
|
||||
# You can run e.g. 'make install DESTDIR=/packages/mc/3.0' to accomplish
|
||||
# You can run e.g. 'make install DESTDIR=/packages/mc/5.0' to accomplish
|
||||
# that.
|
||||
# DESTDIR = /opt/apps/mc/$(VERSION)
|
||||
|
||||
@ -22,7 +22,7 @@ datadir = @datadir@
|
||||
libdir = @libdir@
|
||||
mandir = @mandir@
|
||||
gnomeicondir = @gnomeicondir@
|
||||
xv_bindir = @xv_bindir@
|
||||
xv_bindir = @xv_bindir@
|
||||
corbadir = $(sysconfdir)/CORBA/servers
|
||||
mclibdir = $(libdir)/mc
|
||||
desktopdir = $(mclibdir)/desktop-scripts
|
||||
@ -64,7 +64,7 @@ AWK_VAR_OPTION = @AWK_VAR_OPTION@
|
||||
# No way, to make make happy (except GNU), we cannot use := to append
|
||||
# something to these, so that's why there is a leading _
|
||||
XCFLAGS = @CFLAGS@
|
||||
XCPPFLAGS = @CPPFLAGS@ @MCCPPFLAGS@ -I.. -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(libdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC) -DLOCALEDIR=\""$(localedir)/"\" -DCONFDIR=\""$(confdir)/"\" -DDESKTOP_INIT_DIR=\""$(desktopdir)/"\"
|
||||
XCPPFLAGS = @CPPFLAGS@ @MCCPPFLAGS@ -I.. -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(mclibdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC) -DLOCALEDIR=\""$(localedir)/"\" -DCONFDIR=\""$(confdir)/"\" -DDESKTOP_INIT_DIR=\""$(desktopdir)/"\"
|
||||
XLDFLAGS = @LDFLAGS@
|
||||
XDEFS = @DEFS@
|
||||
XLIBS = @LIBS@
|
||||
|
||||
10
Makefile.in
10
Makefile.in
@ -45,18 +45,18 @@ config.h.in: configure.in acconfig.h
|
||||
|
||||
install: installdirs
|
||||
@for I in $(unixdirs); do cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1; cd ..; done
|
||||
$(INSTALL_DATA) $(srcdir)/FAQ $(DESTDIR)$(libdir)/FAQ
|
||||
$(INSTALL_DATA) $(srcdir)/FAQ $(DESTDIR)$(mclibdir)/FAQ
|
||||
$(INSTALL_PROGRAM) mcfn_install $(DESTDIR)$(suppbindir)/mcfn_install
|
||||
chmod +x $(DESTDIR)$(suppbindir)/mcfn_install
|
||||
@echo "Please verify that the configuration values are correctly"
|
||||
@echo "set in the mc.ext file in $(libdir)"
|
||||
@echo "set in the mc.ext file in $(mclibdir)"
|
||||
|
||||
install.create_vcs:
|
||||
$(INSTALL_PROGRAM) $(srcdir)/create_vcs $(DESTDIR)$(suppbindir)/create_vcs
|
||||
if test x$(DESTDIR) = x; then $(SHELL) $(srcdir)/create_vcs; fi
|
||||
|
||||
installdirs:
|
||||
$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)
|
||||
$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(mclibdir)
|
||||
$(MKINSTALLDIRS) $(DESTDIR)$(mandir) $(DESTDIR)$(man8dir)
|
||||
$(MKINSTALLDIRS) $(DESTDIR)$(icondir) $(DESTDIR)$(suppbindir)
|
||||
$(MKINSTALLDIRS) $(DESTDIR)$(tidir) $(DESTDIR)$(extfsdir)
|
||||
@ -67,10 +67,10 @@ mcfninstall:
|
||||
|
||||
uninstall:
|
||||
@for I in $(unixdirs); do cd $$I; $(MAKE) $@ || exit 1; cd ..; done
|
||||
-$(RMF) $(DESTDIR)$(libdir)/FAQ
|
||||
-$(RMF) $(DESTDIR)$(mclibdir)/FAQ
|
||||
-$(RMF) $(DESTDIR)$(suppbindir)/mcfn_install
|
||||
-rmdir $(DESTDIR)$(suppbindir)
|
||||
-rmdir $(DESTDIR)$(libdir)
|
||||
-rmdir $(DESTDIR)$(mclibdir)
|
||||
@echo Midnight Commander uninstalled
|
||||
|
||||
cross TAGS clean depend dep:
|
||||
|
||||
@ -289,7 +289,7 @@ install_:
|
||||
install_mx: all
|
||||
$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
|
||||
$(MKINSTALLDIRS) $(DESTDIR)$(icondir)
|
||||
$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
|
||||
$(MKINSTALLDIRS) $(DESTDIR)$(mclibdir)
|
||||
$(MKINSTALLDIRS) $(DESTDIR)$(datadir)/mime-info
|
||||
$(MKINSTALLDIRS) $(DESTDIR)$(corbadir)
|
||||
$(MKINSTALLDIRS) $(DESTDIR)$(gnewdir)
|
||||
@ -297,7 +297,7 @@ install_mx: all
|
||||
$(INSTALL_PROGRAM) corba-gmc $(DESTDIR)$(bindir)/$(binprefix)gmc
|
||||
for I in $(ICONS); \
|
||||
do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(icondir)/$$I; done
|
||||
$(INSTALL_DATA) $(srcdir)/layout $(DESTDIR)$(libdir)/layout
|
||||
$(INSTALL_DATA) $(srcdir)/layout $(DESTDIR)$(mclibdir)/layout
|
||||
$(INSTALL_DATA) mc.keys $(DESTDIR)$(datadir)/mime-info
|
||||
$(INSTALL_DATA) $(srcdir)/gmc.gnorba $(DESTDIR)$(corbadir)
|
||||
|
||||
@ -307,7 +307,7 @@ uninstall:
|
||||
for I in $(ICONS); \
|
||||
do $(RMF) $(DESTDIR)$(icondir)/$$I; done
|
||||
-rmdir $(DESTDIR)$(icondir)
|
||||
-$(RMF) $(DESTDIR)$(libdir)/layout
|
||||
-$(RMF) $(DESTDIR)$(mclibdir)/layout
|
||||
-$(RMF) $(DESTDIR)$(datadir)/mime-info/mc.keys
|
||||
-rmdir $(DESTDIR)$(datadir)/mime-info
|
||||
-$(RMF) $(gnewdir)
|
||||
|
||||
@ -54,9 +54,9 @@ distclean:
|
||||
|
||||
install:
|
||||
for I in $(LIBFILES_CONST); \
|
||||
do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(libdir)/$$I; done
|
||||
do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(mclibdir)/$$I; done
|
||||
for I in $(LIBFILES_OUT); \
|
||||
do $(INSTALL_DATA) $(builddir)/lib/$$I $(DESTDIR)$(libdir)/$$I; done
|
||||
do $(INSTALL_DATA) $(builddir)/lib/$$I $(DESTDIR)$(mclibdir)/$$I; done
|
||||
for I in $(TIFILES); \
|
||||
do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(tidir)/$$I; done
|
||||
$(MKINSTALLDIRS) $(DESTDIR)$(confdir)
|
||||
@ -67,11 +67,11 @@ install:
|
||||
|
||||
uninstall:
|
||||
for I in $(LIBFILES_OUT) $(LIBFILES_CONST); \
|
||||
do $(RMF) $(DESTDIR)$(libdir)/$$I; done
|
||||
do $(RMF) $(DESTDIR)$(mclibdir)/$$I; done
|
||||
for I in $(TIFILES); \
|
||||
do $(RMF) $(DESTDIR)$(tidir)/$$I; done
|
||||
-rmdir $(DESTDIR)$(tidir)
|
||||
-rmdir $(DESTDIR)$(libdir)
|
||||
-rmdir $(DESTDIR)$(mclibdir)
|
||||
|
||||
distcopy:
|
||||
$(CP) $(DISTLIB) ../../mc-$(VERSION)/lib
|
||||
|
||||
@ -132,7 +132,7 @@ distclean:
|
||||
install: mc mcmfmt @saver@
|
||||
$(INSTALL_PROGRAM) mc $(DESTDIR)$(bindir)/$(binprefix)mc
|
||||
$(INSTALL_PROGRAM) mcmfmt $(DESTDIR)$(bindir)/$(binprefix)mcmfmt
|
||||
$(SEDCMD2) < $(srcdir)/mc.hlp > $(DESTDIR)$(libdir)/$(libprefix)mc.hlp
|
||||
$(SEDCMD2) < $(srcdir)/mc.hlp > $(DESTDIR)$(mclibdir)/$(libprefix)mc.hlp
|
||||
|
||||
install.saver: cons.saver
|
||||
$(INSTALL_PROGRAM) -m 4755 cons.saver $(DESTDIR)$(suppbindir)/cons.saver
|
||||
@ -141,7 +141,7 @@ uninstall:
|
||||
$(RMF) $(bindir)/$(binprefix)mc
|
||||
$(RMF) $(bindir)/$(binprefix)mcmfmt
|
||||
$(RMF) $(bindir)/$(binprefix)cons.saver
|
||||
$(RMF) $(libdir)/$(libprefix)mc.hlp
|
||||
$(RMF) $(mclibdir)/$(libprefix)mc.hlp
|
||||
|
||||
distcopy: $(srcdir)/mc.hlp
|
||||
$(CP) $(DISTFILES) ../../mc-$(VERSION)/src
|
||||
|
||||
Загрузка…
Ссылка в новой задаче
Block a user