fix configure/make for lefty &co

diff --git a/cmd/dotty/Makefile.am b/cmd/dotty/Makefile.am
index 212e0da88265fa1b422a38cf3bff37637adc4a3c..bebedb0790e76122604dba8f001ac5a1f6c1d603 100644 (file)
--- a/cmd/dotty/Makefile.am
+++ b/cmd/dotty/Makefile.am
@@ -14,8 +14,8 @@ pdf_DATA = $(pdf)
 bin_SCRIPTS = dotty
 lefty_SCRIPTS = $(DOTTYSCRIPTS)
 
-dotty: $(top_srcdir)/dotty/dotty.sh
-       cp $(top_srcdir)/dotty/dotty.sh dotty
+dotty: $(top_srcdir)/cmd/dotty/dotty.sh
+       cp $(top_srcdir)/cmd/dotty/dotty.sh dotty
        chmod +x dotty
 
 .1.pdf:

diff --git a/cmd/lefty/Makefile.am b/cmd/lefty/Makefile.am
index 3f1a99eb3c24500d16933d7ee908713e9335493a..724f42756f68c08cee458fb2341656e00beb2a68 100644 (file)
--- a/cmd/lefty/Makefile.am
+++ b/cmd/lefty/Makefile.am
@@ -3,9 +3,9 @@
 SUBDIRS = ws os cs2l dot2l examples
 
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/lefty/ws/x11 \
-       -I$(top_srcdir)/lefty/os/unix \
-       -I$(top_srcdir)/lefty/dot2l @XAW_INCLUDES@
+       -I$(top_srcdir)/cmd/lefty/ws/x11 \
+       -I$(top_srcdir)/cmd/lefty/os/unix \
+       -I$(top_srcdir)/cmd/lefty/dot2l @XAW_INCLUDES@
 
 man = lefty.1
 pdf = lefty.pdf

diff --git a/cmd/lefty/cs2l/Makefile.am b/cmd/lefty/cs2l/Makefile.am
index 6b3fc257de63c8ce9d0313e69bb6236e8986f55d..87869bcab0c009445ea19bf11aa5ed15dbde5022 100644 (file)
--- a/cmd/lefty/cs2l/Makefile.am
+++ b/cmd/lefty/cs2l/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-AM_CPPFLAGS = -I${top_srcdir}/lefty
+AM_CPPFLAGS = -I$(top_srcdir)/cmd/lefty
 
 noinst_HEADERS = cs2l.h
 # noinst_LTLIBRARIES = libcs2l.la

diff --git a/cmd/lefty/dot2l/Makefile.am b/cmd/lefty/dot2l/Makefile.am
index 0c5b222bcadee52abe2f4b261b3dd5d7a2286cbc..5b60863a67cd69fa4cd09c03b35199b7ebd75d34 100644 (file)
--- a/cmd/lefty/dot2l/Makefile.am
+++ b/cmd/lefty/dot2l/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-AM_CPPFLAGS = -I$(top_srcdir)/lefty
+AM_CPPFLAGS = -I$(top_srcdir)/cmd/lefty
 
 AM_YFLAGS = -dv
 

diff --git a/cmd/lefty/os/unix/Makefile.am b/cmd/lefty/os/unix/Makefile.am
index a3b31cce419f6978c321b4f7939999d9a8f20633..d0cb6796400b86b9a298218554793606fc6b114f 100644 (file)
--- a/cmd/lefty/os/unix/Makefile.am
+++ b/cmd/lefty/os/unix/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-AM_CPPFLAGS = -I$(top_srcdir)/lefty
+AM_CPPFLAGS = -I$(top_srcdir)/cmd/lefty
 
 if WITH_X
 noinst_LTLIBRARIES = libos.la

diff --git a/cmd/lefty/ws/x11/Makefile.am b/cmd/lefty/ws/x11/Makefile.am
index 2418ae944f5001c0aa1ffdfbb1e22610fd47afc5..7642d664d5243c17e755edcef7fca9fc4e7f7681 100644 (file)
--- a/cmd/lefty/ws/x11/Makefile.am
+++ b/cmd/lefty/ws/x11/Makefile.am
@@ -2,7 +2,7 @@
 
 SUBDIRS = libfilereq
 
-AM_CPPFLAGS = -I$(top_srcdir)/lefty @XAW_INCLUDES@
+AM_CPPFLAGS = -I$(top_srcdir)/cmd/lefty @XAW_INCLUDES@
 
 AM_CFLAGS =  @X_CFLAGS@
 

diff --git a/cmd/lneato/Makefile.am b/cmd/lneato/Makefile.am
index c70f3cc5370d50fe3d103da5d58ddfc687e01624..66855521067c70d0ea0e3156238bb928d9d47af8 100644 (file)
--- a/cmd/lneato/Makefile.am
+++ b/cmd/lneato/Makefile.am
@@ -9,8 +9,8 @@ man_MANS = $(man)
 pdf_DATA = $(pdf)
 bin_SCRIPTS = lneato
 
-lneato: ${top_srcdir}/lneato/lneato.sh
-       cp ${top_srcdir}/lneato/lneato.sh lneato
+lneato: ${top_srcdir}/cmd/lneato/lneato.sh
+       cp ${top_srcdir}/cmd/lneato/lneato.sh lneato
        chmod +x lneato
 
 .1.pdf:

diff --git a/configure.ac b/configure.ac
index d8304c200e1a148b856eb38277a2ab57cc445005..5027344fd5fa5085ce9ebaad892072634a97df85 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1306,6 +1306,17 @@ AC_CONFIG_FILES(Makefile
        cmd/dot/libdotneato.pc
        cmd/tools/Makefile
        cmd/gvpr/Makefile
+        cmd/lefty/ws/x11/libfilereq/Makefile
+        cmd/lefty/ws/x11/Makefile
+        cmd/lefty/ws/Makefile
+        cmd/lefty/os/unix/Makefile
+        cmd/lefty/os/Makefile
+        cmd/lefty/dot2l/Makefile
+        cmd/lefty/cs2l/Makefile
+        cmd/lefty/examples/Makefile
+        cmd/lefty/Makefile
+        cmd/lneato/Makefile
+        cmd/dotty/Makefile
        tclpkg/Makefile
        tclpkg/tclstubs/Makefile
        tclpkg/tkstubs/Makefile