Skip to content

Commit

Permalink
build: fix make distcheck
Browse files Browse the repository at this point in the history
Fix several srcdir != builddir issues, and a missing mkdir -p.
  • Loading branch information
cosimoc committed Jul 22, 2015
1 parent 63f137a commit 6c61d5a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions src/Makefile-js.am
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,13 @@ dist_jsutil_DATA = \
js/util/totemMimeTypes.js

jsutil_built_sources = \
$(srcdir)/js/util/path.js
js/util/path.js

BUILT_SOURCES += $(jsutil_built_sources)

js/util/path.js: Makefile js/util/path.js.in
$(AM_V_GEN) $(do_subst) $(srcdir)/js/util/path.js.in > $@
$(AM_V_GEN) mkdir -p js/util && \
$(do_subst) $(srcdir)/js/util/path.js.in > $@

nodist_jsutil_DATA = \
$(jsutil_built_sources)
Expand Down
4 changes: 2 additions & 2 deletions src/Makefile-sushi.am
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ sushi-enum-types.h: stamp-sushi-enum-types.h Makefile
stamp-sushi-enum-types.h: $(sushi_source_h) libsushi/sushi-enum-types.h.in
$(AM_V_GEN) ( cd $(srcdir) && \
$(GLIB_MKENUMS) \
--template $(srcdir)/libsushi/sushi-enum-types.h.in \
--template libsushi/sushi-enum-types.h.in \
$(sushi_source_h) ) >> xgen-beth && \
(cmp -s xgen-beth sushi-enum-types.h || cp xgen-beth sushi-enum-types.h) && \
rm -f xgen-beth && \
Expand All @@ -49,7 +49,7 @@ stamp-sushi-enum-types.h: $(sushi_source_h) libsushi/sushi-enum-types.h.in
sushi-enum-types.c: stamp-sushi-enum-types.h libsushi/sushi-enum-types.c.in
$(AM_V_GEN) ( cd $(srcdir) && \
$(GLIB_MKENUMS) \
--template $(srcdir)/libsushi/sushi-enum-types.c.in \
--template libsushi/sushi-enum-types.c.in \
$(sushi_source_h) ) >> xgen-betc && \
cp xgen-betc sushi-enum-types.c && \
rm -f xgen-betc
Expand Down

0 comments on commit 6c61d5a

Please sign in to comment.