summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2011-03-11 14:42:00 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2011-03-11 14:43:58 -0800
commit16fb559aaf157f7465c52ecd50e4945c5d58c372 (patch)
tree96d5c31d31eb112f5280b3461bab0271613f2a2b
parentaaf318c99efcbc0d53f92059bc3bb74e08ab3c4c (diff)
Make Makefile.am's compatible with Solaris make
Solaris make won't substitute $< in explicit rules, only implicit ones Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--contexts/Makefile.am2
-rw-r--r--scripts/Makefile.am6
2 files changed, 4 insertions, 4 deletions
diff --git a/contexts/Makefile.am b/contexts/Makefile.am
index 6e3824a..aa8d63c 100644
--- a/contexts/Makefile.am
+++ b/contexts/Makefile.am
@@ -16,7 +16,7 @@ PATH_SUBSTS = \
-e 's|@DEFAULT_USER_PATH[@]|$(DEFAULT_USER_PATH)|g'
x11r6: x11r6.in
- $(AM_V_GEN)$(SED) $(PATH_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(PATH_SUBSTS) < $(srcdir)/$@.in > $@
CLEANFILES = $(contexts_DATA)
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 6416069..7745956 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -6,7 +6,7 @@ dist_noinst_DATA = config.in
CONFIG_SUBSTS = -e 's|@rstartdir[@]|$(rstartdir)|g'
config: config.in
- $(AM_V_GEN)$(SED) $(CONFIG_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(CONFIG_SUBSTS) < $(srcdir)/$@.in > $@
CLEANFILES = $(rstart_DATA)
@@ -17,10 +17,10 @@ dist_noinst_SCRIPTS = rstart.in rstartd.in
RSTART_SUBSTS = -e 's|@RSH[@]|$(RSH)|g'
rstart: rstart.in
- $(AM_V_GEN)$(SED) $(RSTART_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(RSTART_SUBSTS) < $(srcdir)/$@.in > $@
RSTARTD_SUBSTS = -e 's|@rstartdir[@]|$(rstartdir)|g'
rstartd: rstartd.in
- $(AM_V_GEN)$(SED) $(RSTARTD_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(RSTARTD_SUBSTS) < $(srcdir)/$@.in > $@
CLEANFILES += $(bin_SCRIPTS)