diff options
| -rw-r--r-- | ACE/ChangeLog | 16 | ||||
| -rw-r--r-- | ACE/bin/MakeProjectCreator/templates/gnu.mpd | 2 | ||||
| -rw-r--r-- | ACE/debian/debian.rules | 2 | ||||
| -rw-r--r-- | ACE/debian/mpc-ace.install | 16 |
4 files changed, 25 insertions, 11 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 31dd4a31f11..37d5afe10ce 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,17 @@ +Mon Sep 13 14:04:48 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + Reverted change below, not correct given new info from Adam + + Thu Sep 9 11:49:30 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/MakeProjectCreator/templates/gnu.mpd: + Removed invalid comma, thanks to Frank Preischl + <Frank dot Preischl at ids dot de> for reporting this + + * debian/debian.rules: + * debian/mpc-ace.install: + Improved + Mon Sep 13 09:25:22 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * bin/generate_doxygen.pl: @@ -131,7 +145,7 @@ Thu Sep 9 11:54:10 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> Thu Sep 9 11:49:30 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * bin/MakeProjectCreator/templates/gnu.mpd: - Removed invalid colon, thanks to Frank Preischl + Removed invalid comma, thanks to Frank Preischl <Frank dot Preischl at ids dot de> for reporting this Thu Sep 9 11:14:45 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> diff --git a/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/ACE/bin/MakeProjectCreator/templates/gnu.mpd index 51348dfc685..1e2dd1c62e4 100644 --- a/ACE/bin/MakeProjectCreator/templates/gnu.mpd +++ b/ACE/bin/MakeProjectCreator/templates/gnu.mpd @@ -732,7 +732,7 @@ install: <%if(postbuild)%>__postbuild__<%else%>all<%endif%> INSTALL_LIB ?= lib ifneq ($(INSTALL_PREFIX),) ifneq ($(install_rpath),0) -LDFLAGS += -Wl,-R $(INSTALL_PREFIX)/$(INSTALL_LIB) +LDFLAGS += -Wl,-R,$(INSTALL_PREFIX)/$(INSTALL_LIB) endif endif diff --git a/ACE/debian/debian.rules b/ACE/debian/debian.rules index 0a80ab05b64..6b6dcf736b1 100644 --- a/ACE/debian/debian.rules +++ b/ACE/debian/debian.rules @@ -50,7 +50,7 @@ extract-stamp: extract: extract-stamp -debian/mpc-ace.sgml: ACE_wrappers/MPC/docs/MPC.sgml +debian/mpc-ace.sgml: MPC/docs/MPC.sgml sed -e 's/mpc\.pl/mpc-ace/g' -e 's/mwc\.pl/mwc-ace/g' $< > $@ debian/%.1 debian/%.5: debian/%.sgml diff --git a/ACE/debian/mpc-ace.install b/ACE/debian/mpc-ace.install index 0a5cec36962..1e74ae9e3b5 100644 --- a/ACE/debian/mpc-ace.install +++ b/ACE/debian/mpc-ace.install @@ -1,10 +1,10 @@ usr/bin/mpc-ace usr/bin/mwc-ace -../../ACE_wrappers/bin/m[p,w]c.pl usr/share/ace/bin -../../ACE_wrappers/bin/MakeProjectCreator usr/share/ace/bin -../../ACE_wrappers/MPC/config usr/share/ace/MPC -../../ACE_wrappers/MPC/modules usr/share/ace/MPC -../../ACE_wrappers/MPC/templates usr/share/ace/MPC -../../ACE_wrappers/MPC/*.pl usr/share/ace/MPC -../../ACE_wrappers/MPC/ChangeLog usr/share/ace/MPC -../../ACE_wrappers/bin/PerlACE usr/share/ace/bin +$ACE_ROOT/bin/m[p,w]c.pl usr/share/ace/bin +$ACE_ROOT/bin/MakeProjectCreator usr/share/ace/bin +$MPC_ROOT/config usr/share/ace/MPC +$MPC_ROOT/modules usr/share/ace/MPC +$MPC_ROOT/templates usr/share/ace/MPC +$MPC_ROOT/*.pl usr/share/ace/MPC +$MPC_ROOT/ChangeLog usr/share/ace/MPC +$ACE_ROOT/PerlACE usr/share/ace/bin |