diff options
author | Ludovic Courtès <ludo@gnu.org> | 2018-02-15 10:25:19 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2018-02-15 10:25:19 +0100 |
commit | a7693f4974aa0517bcf7aa963fc62b4126ddf6a8 (patch) | |
tree | a293ed4ddb0fae28f3da577a8a3973a6b00a7b28 /Makefile.am | |
parent | 8080c17c21fc605674d1d257813e74bb4fb3cfc0 (diff) | |
download | cuirass-a7693f4974aa0517bcf7aa963fc62b4126ddf6a8.tar cuirass-a7693f4974aa0517bcf7aa963fc62b4126ddf6a8.tar.gz |
build: Install (web server fiberized) in its right place.
Previously it would be installed under cuirass/.
* Makefile.am (webmoduledir, webobjectdir): New variables.
(dist_pkgmodule_DATA): Remove src/web/server/fiberized.scm.
(dist_webmodule_DATA, nodist_webobject_DATA): New variables.
(CLEANFILES): Add $(nodist_webobject_DATA).
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index af571b3..39660a0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,6 +30,8 @@ nodist_guileobject_DATA = $(dist_guilesite_DATA:.scm=.go) pkgmoduledir = $(guilesitedir)/$(PACKAGE) pkgobjectdir = $(guileobjectdir)/$(PACKAGE) +webmoduledir = $(guilesitedir)/web/server +webobjectdir = $(guileobjectdir)/web/server dist_pkgmodule_DATA = \ src/cuirass/base.scm \ @@ -37,8 +39,7 @@ dist_pkgmodule_DATA = \ src/cuirass/http.scm \ src/cuirass/logging.scm \ src/cuirass/ui.scm \ - src/cuirass/utils.scm \ - src/web/server/fiberized.scm + src/cuirass/utils.scm nodist_pkgmodule_DATA = \ src/cuirass/config.scm @@ -47,6 +48,12 @@ nodist_pkgobject_DATA = \ $(dist_pkgmodule_DATA:.scm=.go) \ src/cuirass/config.go +dist_webmodule_DATA = \ + src/web/server/fiberized.scm + +nodist_webobject_DATA = \ + $(dist_webmodule_DATA:.scm=.go) + dist_pkgdata_DATA = src/schema.sql TEST_EXTENSIONS = .scm .sh @@ -90,9 +97,10 @@ TESTS = \ --warn=format --warn=unbound-variable --warn=arity-mismatch \ --target="$(host)" --output="$@" "$<" $(devnull_verbose) -CLEANFILES = \ - $(nodist_guilesite_DATA) \ - $(dist_pkgmodule_DATA:.scm=.go) \ +CLEANFILES = \ + $(nodist_guilesite_DATA) \ + $(dist_pkgmodule_DATA:.scm=.go) \ + $(nodist_webobject_DATA) \ src/cuirass/config.go .PHONY: sql-check |