projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enable bang-patterns only when the flag says so (had missed a case before)
[ghc-hetmet.git]
/
distrib
/
Makefile-bin.in
diff --git
a/distrib/Makefile-bin.in
b/distrib/Makefile-bin.in
index
0d28672
..
6df1e05
100644
(file)
--- a/
distrib/Makefile-bin.in
+++ b/
distrib/Makefile-bin.in
@@
-169,10
+169,16
@@
config-pkgs ::
@for i in $(PACKAGE_LIB_SPLICED_FILES) ""; do \
if test "$$i"; then \
echo "Creating a configured version of $$i .."; \
@for i in $(PACKAGE_LIB_SPLICED_FILES) ""; do \
if test "$$i"; then \
echo "Creating a configured version of $$i .."; \
- if [ -f lib/$(platform)/$$i ]; then $(MV) lib/$(platform)/$$i lib/$(platform)/$$i.bak; fi; \
- $(SED) -e "s|\$$libdir|$(libdir)|g;s|\$$datadir|$(datadir)|g" <lib/$(platform)/$$i.bak >lib/$(platform)/$$i; \
+ $(PERL) -i.bak -lpe 's|\$$libdir|$(libdir)|g;s|\$$datadir|$(datadir)|g' lib/$(platform)/$$i; \
fi; \
done
fi; \
done
+ @if test "$(platform)" = "powerpc-apple-darwin"; then \
+ echo "Configuring install names..."; \
+ for i in lib/$(platform)/*; do \
+ sh fix_install_names.sh "$(libdir)" "$$i"; \
+ done; \
+ echo "Done."; \
+ fi
in-place ::
$(MAKE) $(MFLAGS) config-pkgs bindir=`pwd`/bin/$(platform) libdir=`pwd`/lib/$(platform) datadir=`pwd`/share
in-place ::
$(MAKE) $(MFLAGS) config-pkgs bindir=`pwd`/bin/$(platform) libdir=`pwd`/lib/$(platform) datadir=`pwd`/share
@@
-223,6
+229,9
@@
install-bin:
for i in $(PACKAGE_BINS) ""; do \
if test -n "$$i" ; then $(INSTALL_BIN) bin/$(platform)/$$i$(exeext) $(bindir); fi; \
done;
for i in $(PACKAGE_BINS) ""; do \
if test -n "$$i" ; then $(INSTALL_BIN) bin/$(platform)/$$i$(exeext) $(bindir); fi; \
done;
+ for i in $(PACKAGE_OPT_BINS) ""; do \
+ if test -n "$$i" -a ! -f "$(bindir)/$$i" ; then $(INSTALL_BIN) bin/$(platform)/$$i$(exeext) $(bindir); fi; \
+ done;
@for i in $(VERSION_SYMLINKS_FOR) ""; do \
if [ "x$$i" != "x" ]; then \
( cd $(bindir); \
@for i in $(VERSION_SYMLINKS_FOR) ""; do \
if [ "x$$i" != "x" ]; then \
( cd $(bindir); \
@@
-263,7
+272,9
@@
show-install-setup:
install-docs : install-dirs-docs
if test -d share/html ; then $(CP) -r share/html/* $(htmldir) ; fi
for i in share/*.ps; do \
install-docs : install-dirs-docs
if test -d share/html ; then $(CP) -r share/html/* $(htmldir) ; fi
for i in share/*.ps; do \
- $(CP) $$i $(psdir) ; \
+ if test -f "$$i"; then \
+ $(CP) $$i $(psdir) ; \
+ fi \
done
install-dirs-docs:
done
install-dirs-docs: