diff --git a/Makefile.am b/Makefile.am index 633e5808..38b9f4e7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,6 +2,10 @@ AUTOMAKE_OPTIONS = gnu no-dependencies SUBDIRS = doc m4 po src +if USE_COLOR +SUBDIRS += syntax +endif + EXTRA_DIST = ChangeLog.pre-2.1 IMPROVEMENTS README.GIT nano.spec ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index dcdf361f..04b3b507 100644 --- a/configure.ac +++ b/configure.ac @@ -752,10 +752,10 @@ AC_CONFIG_FILES([ Makefile doc/Makefile doc/nanorc.sample -doc/syntax/Makefile m4/Makefile po/Makefile.in src/Makefile +syntax/Makefile nano.spec ]) diff --git a/doc/Makefile.am b/doc/Makefile.am index cac1d8d4..1cbb3139 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,10 +1,6 @@ SUBDIRS = BUILT_SOURCES = -if USE_COLOR -SUBDIRS += syntax -endif - dist_html_DATA = faq.html dist_man_MANS = nano.1 rnano.1 diff --git a/doc/syntax/Makefile.am b/syntax/Makefile.am similarity index 100% rename from doc/syntax/Makefile.am rename to syntax/Makefile.am diff --git a/doc/syntax/asm.nanorc b/syntax/asm.nanorc similarity index 100% rename from doc/syntax/asm.nanorc rename to syntax/asm.nanorc diff --git a/doc/syntax/autoconf.nanorc b/syntax/autoconf.nanorc similarity index 100% rename from doc/syntax/autoconf.nanorc rename to syntax/autoconf.nanorc diff --git a/doc/syntax/awk.nanorc b/syntax/awk.nanorc similarity index 100% rename from doc/syntax/awk.nanorc rename to syntax/awk.nanorc diff --git a/doc/syntax/c.nanorc b/syntax/c.nanorc similarity index 100% rename from doc/syntax/c.nanorc rename to syntax/c.nanorc diff --git a/doc/syntax/changelog.nanorc b/syntax/changelog.nanorc similarity index 100% rename from doc/syntax/changelog.nanorc rename to syntax/changelog.nanorc diff --git a/doc/syntax/cmake.nanorc b/syntax/cmake.nanorc similarity index 100% rename from doc/syntax/cmake.nanorc rename to syntax/cmake.nanorc diff --git a/doc/syntax/css.nanorc b/syntax/css.nanorc similarity index 100% rename from doc/syntax/css.nanorc rename to syntax/css.nanorc diff --git a/doc/syntax/debian.nanorc b/syntax/debian.nanorc similarity index 100% rename from doc/syntax/debian.nanorc rename to syntax/debian.nanorc diff --git a/doc/syntax/default.nanorc b/syntax/default.nanorc similarity index 100% rename from doc/syntax/default.nanorc rename to syntax/default.nanorc diff --git a/doc/syntax/elisp.nanorc b/syntax/elisp.nanorc similarity index 100% rename from doc/syntax/elisp.nanorc rename to syntax/elisp.nanorc diff --git a/doc/syntax/fortran.nanorc b/syntax/fortran.nanorc similarity index 100% rename from doc/syntax/fortran.nanorc rename to syntax/fortran.nanorc diff --git a/doc/syntax/gentoo.nanorc b/syntax/gentoo.nanorc similarity index 100% rename from doc/syntax/gentoo.nanorc rename to syntax/gentoo.nanorc diff --git a/doc/syntax/go.nanorc b/syntax/go.nanorc similarity index 100% rename from doc/syntax/go.nanorc rename to syntax/go.nanorc diff --git a/doc/syntax/groff.nanorc b/syntax/groff.nanorc similarity index 100% rename from doc/syntax/groff.nanorc rename to syntax/groff.nanorc diff --git a/doc/syntax/guile.nanorc b/syntax/guile.nanorc similarity index 100% rename from doc/syntax/guile.nanorc rename to syntax/guile.nanorc diff --git a/doc/syntax/html.nanorc b/syntax/html.nanorc similarity index 100% rename from doc/syntax/html.nanorc rename to syntax/html.nanorc diff --git a/doc/syntax/java.nanorc b/syntax/java.nanorc similarity index 100% rename from doc/syntax/java.nanorc rename to syntax/java.nanorc diff --git a/doc/syntax/javascript.nanorc b/syntax/javascript.nanorc similarity index 100% rename from doc/syntax/javascript.nanorc rename to syntax/javascript.nanorc diff --git a/doc/syntax/json.nanorc b/syntax/json.nanorc similarity index 100% rename from doc/syntax/json.nanorc rename to syntax/json.nanorc diff --git a/doc/syntax/lua.nanorc b/syntax/lua.nanorc similarity index 100% rename from doc/syntax/lua.nanorc rename to syntax/lua.nanorc diff --git a/doc/syntax/makefile.nanorc b/syntax/makefile.nanorc similarity index 100% rename from doc/syntax/makefile.nanorc rename to syntax/makefile.nanorc diff --git a/doc/syntax/man.nanorc b/syntax/man.nanorc similarity index 100% rename from doc/syntax/man.nanorc rename to syntax/man.nanorc diff --git a/doc/syntax/mgp.nanorc b/syntax/mgp.nanorc similarity index 100% rename from doc/syntax/mgp.nanorc rename to syntax/mgp.nanorc diff --git a/doc/syntax/mutt.nanorc b/syntax/mutt.nanorc similarity index 100% rename from doc/syntax/mutt.nanorc rename to syntax/mutt.nanorc diff --git a/doc/syntax/nanorc.nanorc b/syntax/nanorc.nanorc similarity index 100% rename from doc/syntax/nanorc.nanorc rename to syntax/nanorc.nanorc diff --git a/doc/syntax/nftables.nanorc b/syntax/nftables.nanorc similarity index 100% rename from doc/syntax/nftables.nanorc rename to syntax/nftables.nanorc diff --git a/doc/syntax/objc.nanorc b/syntax/objc.nanorc similarity index 100% rename from doc/syntax/objc.nanorc rename to syntax/objc.nanorc diff --git a/doc/syntax/ocaml.nanorc b/syntax/ocaml.nanorc similarity index 100% rename from doc/syntax/ocaml.nanorc rename to syntax/ocaml.nanorc diff --git a/doc/syntax/patch.nanorc b/syntax/patch.nanorc similarity index 100% rename from doc/syntax/patch.nanorc rename to syntax/patch.nanorc diff --git a/doc/syntax/perl.nanorc b/syntax/perl.nanorc similarity index 100% rename from doc/syntax/perl.nanorc rename to syntax/perl.nanorc diff --git a/doc/syntax/php.nanorc b/syntax/php.nanorc similarity index 100% rename from doc/syntax/php.nanorc rename to syntax/php.nanorc diff --git a/doc/syntax/po.nanorc b/syntax/po.nanorc similarity index 100% rename from doc/syntax/po.nanorc rename to syntax/po.nanorc diff --git a/doc/syntax/postgresql.nanorc b/syntax/postgresql.nanorc similarity index 100% rename from doc/syntax/postgresql.nanorc rename to syntax/postgresql.nanorc diff --git a/doc/syntax/pov.nanorc b/syntax/pov.nanorc similarity index 100% rename from doc/syntax/pov.nanorc rename to syntax/pov.nanorc diff --git a/doc/syntax/python.nanorc b/syntax/python.nanorc similarity index 100% rename from doc/syntax/python.nanorc rename to syntax/python.nanorc diff --git a/doc/syntax/ruby.nanorc b/syntax/ruby.nanorc similarity index 100% rename from doc/syntax/ruby.nanorc rename to syntax/ruby.nanorc diff --git a/doc/syntax/rust.nanorc b/syntax/rust.nanorc similarity index 100% rename from doc/syntax/rust.nanorc rename to syntax/rust.nanorc diff --git a/doc/syntax/sh.nanorc b/syntax/sh.nanorc similarity index 100% rename from doc/syntax/sh.nanorc rename to syntax/sh.nanorc diff --git a/doc/syntax/spec.nanorc b/syntax/spec.nanorc similarity index 100% rename from doc/syntax/spec.nanorc rename to syntax/spec.nanorc diff --git a/doc/syntax/tcl.nanorc b/syntax/tcl.nanorc similarity index 100% rename from doc/syntax/tcl.nanorc rename to syntax/tcl.nanorc diff --git a/doc/syntax/tex.nanorc b/syntax/tex.nanorc similarity index 100% rename from doc/syntax/tex.nanorc rename to syntax/tex.nanorc diff --git a/doc/syntax/texinfo.nanorc b/syntax/texinfo.nanorc similarity index 100% rename from doc/syntax/texinfo.nanorc rename to syntax/texinfo.nanorc diff --git a/doc/syntax/xml.nanorc b/syntax/xml.nanorc similarity index 100% rename from doc/syntax/xml.nanorc rename to syntax/xml.nanorc