diff options
| author | Donnie Berkholz <spyderous@gentoo.org> | 2005-10-16 07:39:17 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2005-10-16 07:39:17 +0000 |
| commit | 78284dfd39a59fd4979bc337276b2721ee42f247 (patch) | |
| tree | 273f0ab37fd0abd66ca88cb2c31a938033b15d79 | |
| parent | 67ff8c5476752db2b59079e914b4f00407202f46 (diff) | |
Bug #4725 <https://bugs.freedesktop.org/show_bug.cgi?id=4725> Detect cf
files in the correct location and mirror the monolithic install.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.am | 5 |
2 files changed, 7 insertions, 2 deletions
@@ -0,0 +1,4 @@ +2005-10-16 Donnie Berkholz <spyderous@gentoo.org> + + * Makefile.am: Bug #4725 <https://bugs.freedesktop.org/show_bug.cgi?id=4725> + Detect cf files in the correct location and mirror the monolithic install. diff --git a/Makefile.am b/Makefile.am index 18698dd..1ec0ef6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -XCONFDIR = $(sysconfdir)/X11/config/cf +XCONFDIR = $(libdir)/X11/config bin_SCRIPTS = xmkmf @@ -27,7 +27,8 @@ dist_man1_MANS = \ xmkmf.man xmkmf: xmkmf.cpp - $(RAWCPP) -DCONFIGDIRSPEC=$(XCONFDIR) $(srcdir)/xmkmf.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ + $(RAWCPP) -DCONFIGDIRSPEC='"-I$(XCONFDIR)"' $(srcdir)/xmkmf.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ +# $(RAWCPP) -DCONFIGDIRSPEC=$(XCONFDIR) $(srcdir)/xmkmf.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@ CLEANFILES = xmkmf |