1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
Description: Build a comprehensive patch for Makefile.am. For some reason the previous series of patches could not be applied anymore
Author: Massimo Manghi <mxmanghi@apache.org>
Forwarded: not-needed
Last-Update: 2025-11-16
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = LICENSE contrib doc rivet win/nmakehlp.c src/testing.c src/TclWebcgi.c
-SUBDIRS = src doc
+SUBDIRS = src
RIVETLIB_DESTDIR = $(DESTDIR)@RIVET_TCL_TARGET@
RIVET_PACKAGES = $(RIVETLIB_DESTDIR)/packages
AM_DISTCHECK_CONFIGURE_FLAGS = --with-tcl=${TCL_BIN_DIR} --with-rivet-target-dir=${RIVETLIB_DESTDIR} --with-apxs=${APXS_PREFIX}/bin/apxs
@@ -28,7 +28,12 @@
$(mkinstalldirs) $(RIVETLIB_DESTDIR)/rivet-tcl
$(install_sh) -C -m 644 $(builddir)/rivet/init.tcl $(RIVETLIB_DESTDIR)
$(install_sh) -C -m 644 $(builddir)/rivet/default_request_handler.tcl $(RIVETLIB_DESTDIR)
- $(install_sh) -C -m 644 $(shell /bin/ls $(srcdir)/rivet/rivet-tcl/*) $(RIVETLIB_DESTDIR)/rivet-tcl
+ $(install_sh) -C -m 644 $(shell /bin/ls $(srcdir)/rivet/rivet-tcl/*.tcl) $(RIVETLIB_DESTDIR)/rivet-tcl
+ $(install_sh) -C -m 644 $(srcdir)/rivet/rivet-tcl/tclIndex $(RIVETLIB_DESTDIR)/rivet-tcl
+
+#cp -rv $(srcdir)/rivet/packages $(RIVETLIB_DESTDIR)/
+#-( cd $(RIVETLIB_DESTDIR); rm -f *.la; \
+# echo 'eval pkg_mkIndex -verbose [pwd] init.tcl [glob [file join packages * *.tcl] [file join $(RIVET_LIBS_ARCH) *[info sharedlibextension]]]' | @TCLSH_PROG@ ; )
uninstall-local:
echo 'running target uninstall-local ($(RIVETLIB_DESTDIR))'
@@ -52,21 +57,21 @@
install-packages:
echo 'running target install-packages ($(RIVETLIB_DESTDIR))'
$(mkinstalldirs) $(RIVET_PACKAGES)/asciiglyphs
- $(install_sh) -C -m 644 $(shell /bin/ls $(srcdir)/rivet/packages/asciiglyphs/*) $(RIVET_PACKAGES)/asciiglyphs/
+ $(install_sh) -C -m 644 $(shell /bin/ls $(srcdir)/rivet/packages/asciiglyphs/*.tcl) $(RIVET_PACKAGES)/asciiglyphs/
$(mkinstalldirs) $(RIVET_PACKAGES)/calendar
- $(install_sh) -C -m 644 $(shell /bin/ls $(srcdir)/rivet/packages/calendar/*) $(RIVET_PACKAGES)/calendar/
+ $(install_sh) -C -m 644 $(shell /bin/ls $(srcdir)/rivet/packages/calendar/*.tcl) $(RIVET_PACKAGES)/calendar/
$(mkinstalldirs) $(RIVET_PACKAGES)/dio
- $(install_sh) -C -m 644 $(shell /bin/ls $(srcdir)/rivet/packages/dio/*) $(RIVET_PACKAGES)/dio/
+ $(install_sh) -C -m 644 $(shell /bin/ls $(srcdir)/rivet/packages/dio/*.tcl) $(RIVET_PACKAGES)/dio/
$(mkinstalldirs) $(RIVET_PACKAGES)/entities
- $(install_sh) -C -m 644 $(shell /bin/ls $(srcdir)/rivet/packages/entities/*) $(RIVET_PACKAGES)/entities/
+ $(install_sh) -C -m 644 $(shell /bin/ls $(srcdir)/rivet/packages/entities/*.tcl) $(RIVET_PACKAGES)/entities/
$(mkinstalldirs) $(RIVET_PACKAGES)/form
- $(install_sh) -C -m 644 $(shell /bin/ls $(srcdir)/rivet/packages/form/*) $(RIVET_PACKAGES)/form/
+ $(install_sh) -C -m 644 $(shell /bin/ls $(srcdir)/rivet/packages/form/*.tcl) $(RIVET_PACKAGES)/form/
$(mkinstalldirs) $(RIVET_PACKAGES)/formbroker
- $(install_sh) -C -m 644 $(shell /bin/ls $(srcdir)/rivet/packages/formbroker/*) $(RIVET_PACKAGES)/formbroker/
+ $(install_sh) -C -m 644 $(shell /bin/ls $(srcdir)/rivet/packages/formbroker/*.tcl) $(RIVET_PACKAGES)/formbroker/
$(mkinstalldirs) $(RIVET_PACKAGES)/session
- $(install_sh) -C -m 644 $(shell /bin/ls $(srcdir)/rivet/packages/session/*) $(RIVET_PACKAGES)/session/
+ $(install_sh) -C -m 644 $(shell /bin/ls $(srcdir)/rivet/packages/session/*.tcl) $(RIVET_PACKAGES)/session/
$(mkinstalldirs) $(RIVET_PACKAGES)/tclrivet
- $(install_sh) -C -m 644 $(shell /bin/ls $(srcdir)/rivet/packages/tclrivet/*) $(RIVET_PACKAGES)/tclrivet/
+ $(install_sh) -C -m 644 $(shell /bin/ls $(srcdir)/rivet/packages/tclrivet/*.tcl) $(RIVET_PACKAGES)/tclrivet/
-( cd $(RIVETLIB_DESTDIR); rm -f *.la; \
echo 'eval file delete [glob [file join packages * pkgIndex.tcl]] pkgIndex.tcl' | @TCLSH_PROG@ ; \
echo 'eval pkg_mkIndex -verbose [pwd] init.tcl [glob [file join packages * *.tcl] [file join $(RIVET_LIBS_ARCH) *[info sharedlibextension]]]' | @TCLSH_PROG@ ; )
|
