ports/mc
ports/mc
1
1
Форкнуть 0
Код Релизы 2 Активность

* 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.
Этот коммит содержится в:
Pavel Roskin 2000-09-18 04:57:29 +00:00
родитель ddacf004f7
Коммит 769b082e1b
11 изменённых файлов: 63 добавлений и 40 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

11
ChangeLog
Просмотреть файл

@ -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> 2000-09-17 Pavel Roskin <proski@gnu.org>
* configure.in: fixed wrong use of AC_MSG_RESULT inside * configure.in: fixed wrong use of AC_MSG_RESULT inside

4
Make.common.in
Просмотреть файл

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

7
configure.in
Просмотреть файл

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

14
doc-gnome/C/Makefile.am
Просмотреть файл

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

10
doc/Makefile.in
Просмотреть файл

@ -1,6 +1,8 @@
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
top_builddir = ..
@MCFG@@MCF@ @MCFG@@MCF@
@ -14,12 +16,12 @@ LINUXDOCDIR = /usr/local/linuxdoc-sgml
all: Makefile all: Makefile
Makefile: $(srcdir)/Makefile.in $(builddir)/config.status Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(builddir) && CONFIG_FILES=doc/Makefile CONFIG_HEADERS= $(SHELL) ./config.status cd $(top_builddir) && CONFIG_FILES=doc/Makefile CONFIG_HEADERS= $(SHELL) ./config.status
install: install:
$(MKINSTALLDIRS) $(DESTDIR)$(man1dir) $(mkinstalldirs) $(DESTDIR)$(man1dir)
$(MKINSTALLDIRS) $(DESTDIR)$(man8dir) $(mkinstalldirs) $(DESTDIR)$(man8dir)
-$(SEDCMD2) < mc.1 > $(DESTDIR)$(man1dir)/$(manprefix)mc.$(manext) -$(SEDCMD2) < mc.1 > $(DESTDIR)$(man1dir)/$(manprefix)mc.$(manext)
-$(SEDCMD2) < mcedit.1 > $(DESTDIR)$(man1dir)/$(manprefix)mcedit.$(manext) -$(SEDCMD2) < mcedit.1 > $(DESTDIR)$(man1dir)/$(manprefix)mcedit.$(manext)
-$(SEDCMD2) < mcserv.8 > $(DESTDIR)$(man8dir)/$(manprefix)mcserv.$(man8ext) -$(SEDCMD2) < mcserv.8 > $(DESTDIR)$(man8dir)/$(manprefix)mcserv.$(man8ext)

6
edit/Makefile.in
Просмотреть файл

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

23
gnome/Makefile.in
Просмотреть файл

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

6
gtkedit/Makefile.in
Просмотреть файл

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

6
slang/Makefile.in
Просмотреть файл

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

6
src/Makefile.in
Просмотреть файл

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

10
vfs/Make-mc.in
Просмотреть файл

@ -5,11 +5,13 @@
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
top_builddir = ..
@MCFG@@MCF@ @MCFG@@MCF@
CFLAGS = $(XCFLAGS) -D_LARGEFILE64_SOURCE 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) LDFLAGS = $(XLDFLAGS)
DEFS = $(XDEFS) DEFS = $(XDEFS)
LIBS = @LINTL@ @SHADOWLIB@ $(XLIBS) @TERMNET@ @PAMLIBS@ @LCRYPT@ $(XLIB) LIBS = @LINTL@ @SHADOWLIB@ $(XLIBS) @TERMNET@ @PAMLIBS@ @LCRYPT@ $(XLIB)
@ -209,8 +211,8 @@ VFSHDRS = \
VFSOBJS = $(NONETFILES) @NETFILES@ VFSOBJS = $(NONETFILES) @NETFILES@
Makefile: $(srcdir)/Make-mc.in $(builddir)/config.status Makefile: $(srcdir)/Make-mc.in $(top_builddir)/config.status
cd $(builddir) && CONFIG_FILES=vfs/Makefile:vfs/Make-mc.in CONFIG_HEADERS= $(SHELL) ./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_:
install_mcserv: install_mcserv:
$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(mkinstalldirs) $(DESTDIR)$(bindir)
$(INSTALL_PROGRAM) mcserv $(DESTDIR)$(bindir)/$(binprefix)mcserv $(INSTALL_PROGRAM) mcserv $(DESTDIR)$(bindir)/$(binprefix)mcserv
install.extfs: install.extfs: