diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | runtime/net_1_1/Makefile.am | 4 | ||||
| -rw-r--r-- | runtime/net_2_0/Makefile.am | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index bfe6bff57af..f55692554c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-11-05 Zoltan Varga <vargaz@freemail.hu> + + * runtime/net_2_0/Makefile.am (install-data-local): + * runtime/net_1_1/Makefile.am (install-data-local): Applied patch + from Götz Waschk (waschk@informatik.uni-rostock.de). Make this work + with DESTDIR. + 2004-11-05 Jonathan Pryor <jonpryor@vt.edu> * support/.cvsignore: Ignore generated files. diff --git a/runtime/net_1_1/Makefile.am b/runtime/net_1_1/Makefile.am index 2850813499f..4bd0f9113de 100644 --- a/runtime/net_1_1/Makefile.am +++ b/runtime/net_1_1/Makefile.am @@ -93,8 +93,8 @@ all-local: $(gac_assemblies) install-data-local: @if test -f $(srcdir)/mscorlib.dll.mdb; then \ - echo $(INSTALL_DATA) $(srcdir)/mscorlib.dll.mdb $(corlibdir)/mscorlib.dll.mdb; \ - $(INSTALL_DATA) $(srcdir)/mscorlib.dll.mdb $(corlibdir)/mscorlib.dll.mdb; \ + echo $(INSTALL_DATA) $(srcdir)/mscorlib.dll.mdb $(DESTDIR)$(corlibdir)/mscorlib.dll.mdb; \ + $(INSTALL_DATA) $(srcdir)/mscorlib.dll.mdb $(DESTDIR)$(corlibdir)/mscorlib.dll.mdb; \ fi @if test -n '$(gac_assemblies)'; then \ for i in ''$(gac_assemblies); do \ diff --git a/runtime/net_2_0/Makefile.am b/runtime/net_2_0/Makefile.am index 1656b52a798..d2cd39cfcdd 100644 --- a/runtime/net_2_0/Makefile.am +++ b/runtime/net_2_0/Makefile.am @@ -92,8 +92,8 @@ all-local: $(gac_assemblies) if INSTALL_2_0 install-data-local: @if test -f $(srcdir)/mscorlib.dll.mdb; then \ - echo $(INSTALL_DATA) $(srcdir)/mscorlib.dll.mdb $(corlibdir)/mscorlib.dll.mdb; \ - $(INSTALL_DATA) $(srcdir)/mscorlib.dll.mdb $(corlibdir)/mscorlib.dll.mdb; \ + echo $(INSTALL_DATA) $(srcdir)/mscorlib.dll.mdb $(DESTDIR)$(corlibdir)/mscorlib.dll.mdb; \ + $(INSTALL_DATA) $(srcdir)/mscorlib.dll.mdb $(DESTDIR)$(corlibdir)/mscorlib.dll.mdb; \ fi @if test -n '$(gac_assemblies)'; then \ for i in ''$(gac_assemblies); do \ |