X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=Makefile.am;h=3b6b84a0d099115dcb4abdae9d714fbdfe5ad14d;hb=e6677b63aa90a57b00c2a3f5284b50a837be51a7;hp=7358c78dbc485c7589e06d4a97e4af946364e3c9;hpb=67473e912ec0a0849a70cb61d9368c75dae614ee;p=mmh

diff --git a/Makefile.am b/Makefile.am
index 7358c78..3b6b84a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -457,8 +457,8 @@ sbr_libmh_a_CPPFLAGS = -I./sbr -DNMHETCDIR='"$(sysconfdir)"' \
 		-DMAILSPOOL='"$(mailspool)"' \
 		-DSENDMAILPATH='"$(sendmailpath)"' -DNMHBINDIR='"$(bindir)"' \
 		-DNMHLIBDIR='"$(libdir)"' \
-		-DDEFAULT_EDITOR='"$(default_editor)"' \
-		-DDEFAULT_PAGER='"$(default_pager)"'
+		-DDEFAULT_EDITOR='"$(editorpath)"' \
+		-DDEFAULT_PAGER='"$(pagerpath)"'
 
 sbr_libdtimep_a_SOURCES = sbr/dtimep.l
 sbr_libdtimep_a_CFLAGS = $(sbr_libmh_a_CPPFLAGS) $(DISABLE_UNUSED_MACROS_WARNING)
@@ -486,8 +486,8 @@ man/man.sed: Makefile
 	echo 's,%mandir%,$(mandir),g' >> $@
 	echo 's,%mailspool%,$(mailspool),g' >> $@
 	echo 's,%sendmailpath%,$(sendmailpath),g' >> $@
-	echo 's,%default_editor%,$(default_editor),g' >> $@
-	echo 's,%default_pager%,$(default_pager),g' >> $@
+	echo 's,%default_editor%,$(editorpath),g' >> $@
+	echo 's,%default_pager%,$(pagerpath),g' >> $@
 	echo 's,%manext1%,$(manext1),g' >> $@
 	echo 's,%manext5%,$(manext5),g' >> $@
 	echo 's,%manext8%,$(manext8),g' >> $@
@@ -534,6 +534,7 @@ rpm: dist
 	@cp -p nmh.spec $(rpmdir)/SPECS
 	@rpmbuild --define '_topdir $(rpmdir)' \
 	  --define '_tmppath %{_topdir}/TMP' \
+	  --define "_sysconfdir $(DESTDIR)$(sysconfdir)" \
 	  -ba $(rpmdir)/SPECS/nmh.spec
 .PHONY: rpm