*** env/Makefile.am.orig Fri Nov  7 10:55:14 2003
--- env/Makefile.am	Mon Apr  5 16:01:05 2004
***************
*** 3,8 ****
--- 3,12 ----
  TEST_CONFIG_SCRIPT = package Apache::TestMM; filter_args(); generate_script("t/TEST")
  EXTRA_DIST = t c-modules
  
+ INSTDSO = $(shell $(APR_CONFIG) --installbuilddir)/instdso.sh
+ SHLIBTOOL = $(shell $(APR_CONFIG) --installbuilddir)/libtool
+ APACHE2_MODULES = $(shell /usr/sbin/apxs2 -q LIBEXECDIR)
+ 
  check_PROGRAMS = test_cgi
  
  if BUILD_HTTPD
***************
*** 31,37 ****
  mod_apreq_la_LDFLAGS = -export-dynamic -module -avoid-version -rpath $(APACHE2_MODULES)
  
  install-exec-local: mod_apreq.la
! 	@APACHE2_APXS@ -i -a -n apreq mod_apreq.la
  
  t/TEST : Makefile.am t/TEST.PL
  	@PERL@ -MApache::TestMM -e '$(TEST_CONFIG_SCRIPT)' -- -apxs @APACHE2_APXS@
--- 35,42 ----
  mod_apreq_la_LDFLAGS = -export-dynamic -module -avoid-version -rpath $(APACHE2_MODULES)
  
  install-exec-local: mod_apreq.la
! 	@-mkdir $(DESTDIR)$(APACHE2_MODULES)
! 	$(INSTDSO) SH_LIBTOOL=$(SHLIBTOOL) mod_apreq.la $(DESTDIR)$(APACHE2_MODULES)
  
  t/TEST : Makefile.am t/TEST.PL
  	@PERL@ -MApache::TestMM -e '$(TEST_CONFIG_SCRIPT)' -- -apxs @APACHE2_APXS@