From 1482bc059484569c115087f7d603e4992fb90b50 Mon Sep 17 00:00:00 2001 From: Timur Bakeyev Date: Mon, 22 Mar 1999 00:01:53 +0000 Subject: [PATCH] Mon Mar 22 03:00:15 1999 Timur Bakeyev * edit/syntax.c: Remove extra "|" in "file ..\*\\.(pp|PP|pas|PAS|)$ \ Pascal Program" (Heh, second time :) * Makefile.common: Until things gets clear, keep syntax rules in $(prefix)/lib/mc//syntax, as this is how (LIBDIR "/syntax") expands. Also, $(libdir) changed to $(mclibdir), to avoid confusion with expanded @libdir@. --- ChangeLog | 13 ++++++++++++- Make.common.in | 32 +++++++++++++++++--------------- gtkedit/syntax.c | 2 +- 3 files changed, 30 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 892937e92..16a357a4c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,17 @@ +Mon Mar 22 03:00:15 1999 Timur Bakeyev + + * edit/syntax.c: Remove extra "|" in "file ..\*\\.(pp|PP|pas|PAS|)$ \ + Pascal Program" (Heh, second time :) + + * Makefile.common: Until things gets clear, keep syntax rules in + $(prefix)/lib/mc//syntax, as this is how (LIBDIR "/syntax") expands. + + Also, $(libdir) changed to $(mclibdir), to avoid confusion with expanded + @libdir@. + Mon Mar 22 01:52:32 1999 Timur Bakeyev - * configure.in, Makefile.in, Makefile-common: Add syntax/Makefile.in, + * configure.in, Makefile.in, Makefile.common: Add syntax/Makefile.in, as requested by Paul. Still, need some checking... Sun Mar 21 03:55:24 1999 Paul Sheer diff --git a/Make.common.in b/Make.common.in index 4391f6e5f..106952f6d 100644 --- a/Make.common.in +++ b/Make.common.in @@ -18,26 +18,28 @@ manprefix = builddir = @builddir@ bindir = @bindir@ sysconfdir = @sysconfdir@ -corbadir = $(sysconfdir)/CORBA/servers -libdir = $(exec_prefix)/lib/mc -desktopdir = $(libdir)/desktop-scripts -idldir = $(prefix)/share/idl -suppbindir = $(libdir)/bin -gnewdir = $(prefix)/share/mc/templates -tidir = $(libdir)/term -extfsdir = $(libdir)/extfs -confdir = $(prefix)/etc datadir = @datadir@ -icondir = $(datadir)/pixmaps/mc -syntaxdir = $(libdir)/cooledit/syntax -gnomeicondir = @gnomeicondir@ -localedir = $(datadir)/locale +libdir = @libdir@ mandir = @mandir@ +gnomeicondir = @gnomeicondir@ +xv_bindir = @xv_bindir@ +corbadir = $(sysconfdir)/CORBA/servers +mclibdir = $(libdir)/mc +desktopdir = $(mclibdir)/desktop-scripts +idldir = $(prefix)/share/idl +suppbindir = $(mclibdir)/bin +gnewdir = $(prefix)/share/mc/templates +tidir = $(mclibdir)/term +extfsdir = $(mclibdir)/extfs +confdir = $(prefix)/etc +icondir = $(datadir)/pixmaps/mc +syntaxdir = $(mclibdir)/syntax +localedir = $(datadir)/locale man1dir = $(mandir)/man1 manext = 1 man8dir = $(mandir)/man8 -man8ext = 8 -xv_bindir = @xv_bindir@ +man8ext = 8 + top_srcdir = $(rootdir) # Tools & program stuff diff --git a/gtkedit/syntax.c b/gtkedit/syntax.c index 64493dfe0..fde237304 100644 --- a/gtkedit/syntax.c +++ b/gtkedit/syntax.c @@ -1068,7 +1068,7 @@ char *syntax_text[] = { "file ..\\*\\\\.(htm|html|HTM|HTML)$ HTML\\sFile", "include html.syntax", "", -"file ..\\*\\\\.(pp|PP|pas|PAS|)$ Pascal Program", +"file ..\\*\\\\.(pp|PP|pas|PAS)$ Pascal Program", "include pascal.syntax", "", "file ..\\*\\\\.tex$ LaTeX\\s2.09\\sDocument",