mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-03 10:04:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

* Make.common.in: Added installcheck to placate "make distcheck"

Browse Source 
* configure.in, Make.common.in, doc/Makefile.in,
        edit/Makefile.in, gnome/Makefile.in, gtkedit/Makefile.in,
        slang/Makefile.in, src/Makefile.in, vfs/Make-mc.in: Replacing
        variable MKINSTALLDIRS and builddir with Automake-compatible
        mkinstalldirs and top_builddir.
        * doc-gnome/C/Makefile.am: Only maintainers regenerate html
        files. Added uninstall-local target.
This commit is contained in:
Pavel Roskin 2000-09-18 04:57:29 +00:00
parent ddacf004f7
commit 769b082e1b
11 changed files with 63 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2000-09-18 Pavel Roskin <proski@gnu.org>
* Make.common.in: Added installcheck to placate "make distcheck"
* configure.in, Make.common.in, doc/Makefile.in,
edit/Makefile.in, gnome/Makefile.in, gtkedit/Makefile.in,
slang/Makefile.in, src/Makefile.in, vfs/Make-mc.in: Replacing
variable MKINSTALLDIRS and builddir with Automake-compatible
mkinstalldirs and top_builddir.
* doc-gnome/C/Makefile.am: Only maintainers regenerate html
files. Added uninstall-local target.
2000-09-17 Pavel Roskin <proski@gnu.org>
* configure.in: fixed wrong use of AC_MSG_RESULT inside

4
Make.common.in
View File

@ -15,7 +15,6 @@ exec_prefix = @exec_prefix@
binprefix =
manprefix =
builddir = @builddir@
bindir = @bindir@
sysconfdir = @sysconfdir@
datadir = @datadir@
@ -40,7 +39,6 @@ man8dir = $(mandir)/man8
man8ext = 8
# Tools & program stuff
MKINSTALLDIRS = @MKINSTALLDIRS@
SEDCMD = @SEDCMD@
SEDCMD2 = @SEDCMD2@
@SET_MAKE@
@ -110,4 +108,6 @@ dummy:
# Added for compatability with Automake
dvi:
installcheck:
# End of Make.common

7
configure.in
View File

@ -680,8 +680,8 @@ INTLSUB=""
LINTL=""
if test x$USE_NLS = xyes; then
if test x$USE_INCLUDED_LIBINTL = xyes; then
CPPFLAGS="$CPPFLAGS -I\$(builddir)/intl"
LINTL="-L\$(builddir)/intl -lintl"
CPPFLAGS="$CPPFLAGS -I\$(top_builddir)/intl"
LINTL="-L\$(top_builddir)/intl -lintl"
fi
INTLSUB=intl
fi
@ -1116,9 +1116,6 @@ else
fi
AC_SUBST(PCENTRULE)
AC_SUBST(builddir)
builddir=`pwd`
dnl
dnl Output configuration files
dnl

14
doc-gnome/C/Makefile.am
View File

@ -22,11 +22,11 @@ SGML_FILES = gmc.sgml
EXTRA_DIST = topic.dat $(SGML_FILES) $(DISTFIGS)
$(srcdir)/index.html: $(SGML_FILES)
db2html $(srcdir)/gmc.sgml && \
rm -f *.html *.css && \
mv gmc/*.html gmc/*.css $(srcdir)
rm -rf gmc
$(srcdir)/index.html: @MAINT@ $(SGML_FILES)
@MAINT@ db2html $(srcdir)/gmc.sgml && \
@MAINT@ rm -f $(srcdir)/*.html $(srcdir)/*.css && \
@MAINT@ mv gmc/*.html gmc/*.css $(srcdir)
@MAINT@ rm -rf gmc
dist-hook: $(srcdir)/index.html
cp $(srcdir)/*.html $(srcdir)/*.css $(distdir)
@ -36,6 +36,10 @@ install-data-local: $(srcdir)/index.html
$(INSTALL_DATA) $$file $(DESTDIR)$(gmc_helpdir) || exit 1; \
done
uninstall-local: $(srcdir)/index.html
rm -f $(DESTDIR)$(gmc_helpdir)/*.html
rm -f $(DESTDIR)$(gmc_helpdir)/*.css
dvi-local: gmc.dvi
# "make distcheck" (automake-1.4) requires that *.dvi are created in the

10
doc/Makefile.in
View File

@ -1,6 +1,8 @@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
top_builddir = ..
@MCFG@@MCF@
@ -14,12 +16,12 @@ LINUXDOCDIR = /usr/local/linuxdoc-sgml
all: Makefile
Makefile: $(srcdir)/Makefile.in $(builddir)/config.status
cd $(builddir) && CONFIG_FILES=doc/Makefile CONFIG_HEADERS= $(SHELL) ./config.status
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_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)

6
edit/Makefile.in
View File

@ -1,6 +1,8 @@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
top_builddir = ..
@MCFG@@MCF@
@ -31,8 +33,8 @@ DIST = Makefile.in $(EDITSRC)
all: @LIBEDIT_A@
Makefile: $(srcdir)/Makefile.in $(builddir)/config.status
cd $(builddir) && CONFIG_FILES=edit/Makefile CONFIG_HEADERS= $(SHELL) ./config.status
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && CONFIG_FILES=edit/Makefile CONFIG_HEADERS= $(SHELL) ./config.status
.c.o:
$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) -DMIDNIGHT $<

23
gnome/Makefile.in
View File

@ -1,6 +1,8 @@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
top_builddir = ..
top_srcdir = $(srcdir)/..
@MCFG@@MCF@
@ -102,7 +104,6 @@ GNOMEHDRS = \
gwidget.h
ICONS = \
directory.xpm \
i-blockdev.png \
i-cdrom.png \
i-chardev.png \
@ -219,14 +220,12 @@ EXTRA_DIST = \
gmc.gnorba \
mc.keys.in.in \
gimp.image.desktop \
magicdev.idl
DISTGNOME_NEW = \
gimp.image.desktop application.x-gnumeric.desktop
magicdev.idl \
application.x-gnumeric.desktop
DISTGNOME = \
Makefile.in ChangeLog $(EXTRA_DIST) $(CORBA_SOURCES) \
$(PIXMAPS) $(ICONS) $(GNOMESRCS) $(GNOMEHDRS) $(DISTGNOME_NEW) \
$(PIXMAPS) $(ICONS) $(GNOMESRCS) $(GNOMEHDRS) \
$(CLIENTSRCS) gmc-window.c gmc-window.h
.c.o:
@ -324,12 +323,12 @@ install: install_@mx@
install_:
install_mx: all
$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
$(MKINSTALLDIRS) $(DESTDIR)$(icondir)
$(MKINSTALLDIRS) $(DESTDIR)$(mclibdir)
$(MKINSTALLDIRS) $(DESTDIR)$(datadir)/mime-info
$(MKINSTALLDIRS) $(DESTDIR)$(corbadir)
$(MKINSTALLDIRS) $(DESTDIR)$(gnewdir)
$(mkinstalldirs) $(DESTDIR)$(bindir)
$(mkinstalldirs) $(DESTDIR)$(icondir)
$(mkinstalldirs) $(DESTDIR)$(mclibdir)
$(mkinstalldirs) $(DESTDIR)$(datadir)/mime-info
$(mkinstalldirs) $(DESTDIR)$(corbadir)
$(mkinstalldirs) $(DESTDIR)$(gnewdir)
$(INSTALL_PROGRAM) plain-gmc $(DESTDIR)$(bindir)/$(binprefix)plain-gmc
$(INSTALL_PROGRAM) corba-gmc $(DESTDIR)$(bindir)/$(binprefix)gmc
$(INSTALL_PROGRAM) gmc-client $(DESTDIR)$(bindir)/$(binprefix)gmc-client

6
gtkedit/Makefile.in
View File

@ -1,6 +1,8 @@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
top_builddir = ..
@MCFG@@MCF@
@ -30,8 +32,8 @@ DIST = ChangeLog Makefile.in $(EDITSRC)
all: @libgtkedit@
Makefile: $(srcdir)/Makefile.in $(builddir)/config.status
cd $(builddir) && CONFIG_FILES=gtkedit/Makefile CONFIG_HEADERS= $(SHELL) ./config.status
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && CONFIG_FILES=gtkedit/Makefile CONFIG_HEADERS= $(SHELL) ./config.status
.c.o:
$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) -DGTK $<

6
slang/Makefile.in
View File

@ -1,6 +1,8 @@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
top_builddir = ..
@MCFG@@MCF@
@ -29,8 +31,8 @@ DISTSLANG = Makefile.in ChangeLog README $(SLANGSRCS) $(SLANGHDRS)
all: @LIBSLANG@
Makefile: $(srcdir)/Makefile.in $(builddir)/config.status
cd $(builddir) && CONFIG_FILES=slang/Makefile CONFIG_HEADERS= $(SHELL) ./config.status
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && CONFIG_FILES=slang/Makefile CONFIG_HEADERS= $(SHELL) ./config.status
.c.o:
$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<

6
src/Makefile.in
View File

@ -1,6 +1,8 @@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
top_builddir = ..
SHELL = @SHELL@
@MCFG@@MCF@
@ -60,8 +62,8 @@ DISTFILES = \
all: mc mcmfmt $(srcdir)/mc.hlp @saver_target@ Makefile
Makefile: $(srcdir)/Makefile.in $(builddir)/config.status
cd $(builddir) && CONFIG_FILES=src/Makefile CONFIG_HEADERS= $(SHELL) ./config.status
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && CONFIG_FILES=src/Makefile CONFIG_HEADERS= $(SHELL) ./config.status
.c.o:
$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<

10
vfs/Make-mc.in
View File

@ -5,11 +5,13 @@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
top_builddir = ..
@MCFG@@MCF@
CFLAGS = $(XCFLAGS) -D_LARGEFILE64_SOURCE
CPPFLAGS = $(XCPPFLAGS) -I$(builddir)/vfs -I$(srcdir)/samba/ubiqx -I$(srcdir)/samba/smbwrapper
CPPFLAGS = $(XCPPFLAGS) -I. -I$(srcdir)/samba/ubiqx -I$(srcdir)/samba/smbwrapper
LDFLAGS = $(XLDFLAGS)
DEFS = $(XDEFS)
LIBS = @LINTL@ @SHADOWLIB@ $(XLIBS) @TERMNET@ @PAMLIBS@ @LCRYPT@ $(XLIB)
@ -209,8 +211,8 @@ VFSHDRS = \
VFSOBJS = $(NONETFILES) @NETFILES@
Makefile: $(srcdir)/Make-mc.in $(builddir)/config.status
cd $(builddir) && CONFIG_FILES=vfs/Makefile:vfs/Make-mc.in CONFIG_HEADERS= $(SHELL) ./config.status
Makefile: $(srcdir)/Make-mc.in $(top_builddir)/config.status
cd $(top_builddir) && CONFIG_FILES=vfs/Makefile:vfs/Make-mc.in CONFIG_HEADERS= $(SHELL) ./config.status
#
@ -275,7 +277,7 @@ install: install_@mcserv@ install.extfs
install_:
install_mcserv:
$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
$(mkinstalldirs) $(DESTDIR)$(bindir)
$(INSTALL_PROGRAM) mcserv $(DESTDIR)$(bindir)/$(binprefix)mcserv
install.extfs: