From a531f2141fe186ea20a5da7652a6d5327a0d09d1 Mon Sep 17 00:00:00 2001 From: Miguel de Icaza Date: Wed, 24 Mar 1999 22:18:17 +0000 Subject: [PATCH] 1999-03-24 Federico Mena Quintero * Make.common.in: There were conflicting definitions of mclibdir (one for installation, one for source). Now the source one is called mcsrclibdir. * doc/Makefile.in: Use mcsrclibdir where appropriate. 1999-03-24 Federico Mena Quintero * Makefile.in: Use mcsrclibdir where appropriate. --- ChangeLog | 10 +++++++++- Make.common.in | 18 +++++++++--------- doc/Makefile.in | 4 ++-- src/ChangeLog | 4 ++++ src/Makefile.in | 4 ++-- 5 files changed, 26 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 16a357a4c..ea8fb266a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,12 @@ -Mon Mar 22 03:00:15 1999 Timur Bakeyev +1999-03-24 Federico Mena Quintero + + * Make.common.in: There were conflicting definitions of mclibdir + (one for installation, one for source). Now the source one is + called mcsrclibdir. + + * doc/Makefile.in: Use mcsrclibdir where appropriate. + +on Mar 22 03:00:15 1999 Timur Bakeyev * edit/syntax.c: Remove extra "|" in "file ..\*\\.(pp|PP|pas|PAS|)$ \ Pascal Program" (Heh, second time :) diff --git a/Make.common.in b/Make.common.in index 106952f6d..a30efcfe5 100644 --- a/Make.common.in +++ b/Make.common.in @@ -71,15 +71,15 @@ XLIBS = @LIBS@ # Where do we have the sources? # You shouldn't have to edit this :) -mcsrcdir = $(rootdir)/src -docdir = $(rootdir)/doc -mclibdir = $(rootdir)/lib -slangdir = $(rootdir)/slang -vfsdir = $(rootdir)/vfs -xvdir = $(rootdir)/xv -tkdir = $(rootdir)/tk -gnomedir = $(rootdir)/gnome -icodir = $(rootdir)/icons +mcsrcdir = $(rootdir)/src +docdir = $(rootdir)/doc +mcsrclibdir = $(rootdir)/lib +slangdir = $(rootdir)/slang +vfsdir = $(rootdir)/vfs +xvdir = $(rootdir)/xv +tkdir = $(rootdir)/tk +gnomedir = $(rootdir)/gnome +icodir = $(rootdir)/icons hpath = -I$(mcsrcdir) -I$(slangdir) -I$(vfsdir) -I$(xvdir) -I$(xvdir)/support/xview_private -I$(tkdir) diff --git a/doc/Makefile.in b/doc/Makefile.in index 6a4eea45f..be893021e 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -59,9 +59,9 @@ mc.txt: mc.sgml ../src/fixhlp: cd ../src; $(MAKE) fixhlp -mc.hlp: mc.sgml ../src/fixhlp $(mclibdir)/xnc.hlp +mc.hlp: mc.sgml ../src/fixhlp $(mcsrclibdir)/xnc.hlp $(LINUXDOCDIR)/bin/format -T hlp $(srcdir)/mc | ../src/fixhlp 58 mc.hlp.toc > mc.hlp.tmp - cat mc.hlp.toc mc.hlp.tmp $(mclibdir)/xnc.hlp > mc.hlp + cat mc.hlp.toc mc.hlp.tmp $(mcsrclibdir)/xnc.hlp > mc.hlp $(RMF) mc.hlp.toc mc.hlp.tmp mc.texi: mc.sgml diff --git a/src/ChangeLog b/src/ChangeLog index 4c31377ee..ba3e38cbf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +1999-03-24 Federico Mena Quintero + + * Makefile.in: Use mcsrclibdir where appropriate. + 1999-03-22 Miguel de Icaza * treestore.c (process_special_dirs): Free memory here. diff --git a/src/Makefile.in b/src/Makefile.in index aa034ebd5..bb07b9517 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -98,9 +98,9 @@ libedit.a: @PCENTRULE@ -$(RMF) libedit.a @PCENTRULE@ $(LN_S) ../edit/libedit.a . -$(srcdir)/mc.hlp: $(docdir)/mc.1.in $(mclibdir)/xnc.hlp $(srcdir)/gindex.pl +$(srcdir)/mc.hlp: $(docdir)/mc.1.in $(mcsrclibdir)/xnc.hlp $(srcdir)/gindex.pl $(MAKE) man2hlp - ./man2hlp 58 $(docdir)/mc.1.in | cat - $(mclibdir)/xnc.hlp | \ + ./man2hlp 58 $(docdir)/mc.1.in | cat - $(mcsrclibdir)/xnc.hlp | \ perl $(srcdir)/gindex.pl > $(srcdir)/mc.hlp mc.html: $(docdir)/mc.1.in man2hlp