After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 712171 - gsettings.m4: @GSETTINGS_RULES@: Support srcdir != builddir with nonrecursive make
gsettings.m4: @GSETTINGS_RULES@: Support srcdir != builddir with nonrecursive...
Status: RESOLVED FIXED
Product: glib
Classification: Platform
Component: general
unspecified
Other All
: Normal normal
: ---
Assigned To: gtkdev
gtkdev
Depends on:
Blocks:
 
 
Reported: 2013-11-12 18:49 UTC by Colin Walters
Modified: 2013-11-18 19:34 UTC
See Also:
GNOME target: ---
GNOME version: ---

Attachments
gsettings.m4: @GSETTINGS_RULES@: Support srcdir != builddir with nonrecursive make (1.39 KB, patch)
2013-11-12 18:49 UTC, Colin Walters 		committed Details | Review

Description Colin Walters 2013-11-12 18:49:14 UTC 
In hotssh I use nonrecursive make.  gnome-continuous uses srcdir !=
builddir by default.  @GSETTINGS_RULES@ will then attempt to touch a
nonexistent path.

This patch fixes that.
Comment 1 Colin Walters 2013-11-12 18:49:15 UTC 
Created attachment 259687 [details] [review]
gsettings.m4: @GSETTINGS_RULES@: Support srcdir != builddir with nonrecursive make
Comment 2 Dan Winship 2013-11-16 14:53:22 UTC 
Comment on attachment 259687 [details] [review]
gsettings.m4: @GSETTINGS_RULES@: Support srcdir != builddir with nonrecursive make

>+	$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && mkdir -p [$$](dirname [$]@) && touch [$]@

You can use "$(@D)" rather than "$(dirname $@)"

(Also, all the stuff with $d looks unnecessary... possibly leftovers from when the rule included a "cd" or something?)
Comment 3 Colin Walters 2013-11-18 18:37:34 UTC 
The use of $d appears to come from https://git.gnome.org/browse/glib/commit/?id=b3593693d918f0ae97094f6712d817180b8eea6a

But... $< should reference the correct path anyways, right?
Comment 4 Dan Winship 2013-11-18 18:42:45 UTC 
right. afaict that commit makes no sense
Comment 5 Colin Walters 2013-11-18 19:19:57 UTC 
Attachment 259687 [details] pushed as 3c2d52c - gsettings.m4: @GSETTINGS_RULES@: Support srcdir != builddir with nonrecursive make
Comment 6 Colin Walters 2013-11-18 19:34:28 UTC 
(In reply to comment #4)
> right. afaict that commit makes no sense

Followup in https://bugzilla.gnome.org/show_bug.cgi?id=712630