[linux-lvm] DESTDIR is broken in 1.00.09

[linux-lvm] DESTDIR is broken in 1.00.09

[Arkadiusz Miskiewicz]

[-- Attachment #1: Type: text/plain, Size: 734 bytes --]

Hi,

Current testdir support is broken: try
./configure --bindir=/usr/bin --mandir=/usr/share/man etc
and you will end up with make.tmpl like

# Setup directory variables
prefix = $(DESTDIR)/usr
exec_prefix = $(DESTDIR)/usr
bindir = /usr/bin
includedir = /usr/include
libdir = /usr/lib
sbindir = /sbin
infodir = /usr/share/info
mandir = /usr/share/man
kerneldir =
interface = ioctl
interfacedir = $(top_srcdir)/lib/$(interface)

bindir, libdir and friends are substituted to ${prefix}/bin only when --bindir 
is not specified.

Attached patch fixes that properly.

-- 
Arkadiusz Miśkiewicz     CS at FoE, Wroclaw University of Technology
arekm.pld-linux.org, 1024/3DB19BBD, JID: arekm.jabber.org, PLD/Linux

[-- Attachment #2: device-mapper-install.patch --]
[-- Type: text/x-diff, Size: 3222 bytes --]

diff -urN device-mapper.1.00.09.org/dmsetup/Makefile.in device-mapper.1.00.09/dmsetup/Makefile.in
--- device-mapper.1.00.09.org/dmsetup/Makefile.in	2004-04-01 01:58:07.096597280 +0200
+++ device-mapper.1.00.09/dmsetup/Makefile.in	2004-04-01 02:01:38.120516768 +0200
@@ -28,7 +28,7 @@
 	      -ldevmapper
 
 install: dmsetup
-	$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
+	$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) $< $(DESTDIR)$(sbindir)/$<
 
 .PHONY: install 
 
diff -urN device-mapper.1.00.09.org/lib/Makefile.in device-mapper.1.00.09/lib/Makefile.in
--- device-mapper.1.00.09.org/lib/Makefile.in	2004-04-01 01:58:07.179584664 +0200
+++ device-mapper.1.00.09/lib/Makefile.in	2004-04-01 02:02:30.597539048 +0200
@@ -30,29 +30,29 @@
 
 
 install: install_@interface@
-	$(LN_S) -f libdevmapper.so.$(LIB_VERSION) $(libdir)/libdevmapper.so
+	$(LN_S) -f libdevmapper.so.$(LIB_VERSION) $(DESTDIR)$(libdir)/libdevmapper.so
 	$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 444 libdevmapper.h \
-		$(includedir)/libdevmapper.h
+		$(DESTDIR)$(includedir)/libdevmapper.h
 
 install_static: install_@interface@_static
-	$(LN_S) -f libdevmapper.a.$(LIB_VERSION) $(libdir)/libdevmapper.a
+	$(LN_S) -f libdevmapper.a.$(LIB_VERSION) $(DESTDIR)$(libdir)/libdevmapper.a
 	$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 444 libdevmapper.h \
-		$(includedir)/libdevmapper.h
+		$(DESTDIR)$(includedir)/libdevmapper.h
 
 
 .PHONY: install install_@interface@ install_static install_@interface@_static
 
 install_fs: fs/libdevmapper.so
 	$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) $< \
-		$(libdir)/libdevmapper.so.$(LIB_VERSION)
+		$(DESTDIR)$(libdir)/libdevmapper.so.$(LIB_VERSION)
 
 install_ioctl: ioctl/libdevmapper.so
 	$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) $< \
-		$(libdir)/libdevmapper.so.$(LIB_VERSION)
+		$(DESTDIR)$(libdir)/libdevmapper.so.$(LIB_VERSION)
 
 install_ioctl_static: ioctl/libdevmapper.a
 	$(INSTALL) -D -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) $< \
-		$(libdir)/libdevmapper.a.$(LIB_VERSION)
+		$(DESTDIR)$(libdir)/libdevmapper.a.$(LIB_VERSION)
 
 distclean_lib: 
 	$(RM) libdm-common.h
diff -urN device-mapper.1.00.09.org/make.tmpl.in device-mapper.1.00.09/make.tmpl.in
--- device-mapper.1.00.09.org/make.tmpl.in	2004-04-01 01:58:07.094597584 +0200
+++ device-mapper.1.00.09/make.tmpl.in	2004-04-01 02:03:19.789060800 +0200
@@ -27,8 +27,8 @@
 LD_DEPS += @LD_DEPS@
 
 # Setup directory variables
-prefix = $(DESTDIR)@prefix@
-exec_prefix = $(DESTDIR)@exec_prefix@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
 bindir = @bindir@
 includedir = @includedir@
 libdir = @libdir@
diff -urN device-mapper.1.00.09.org/man/Makefile.in device-mapper.1.00.09/man/Makefile.in
--- device-mapper.1.00.09.org/man/Makefile.in	2004-04-01 01:58:07.195582232 +0200
+++ device-mapper.1.00.09/man/Makefile.in	2004-04-01 02:02:45.565263608 +0200
@@ -25,7 +25,7 @@
 	@echo "*** Installing $(ALL_MANUALS) in $(MAN8DIR) ***"
 	@for f in $(MANUALS); \
 	do \
-	   $(RM) $(MAN8DIR)/$$f; \
-	   @INSTALL@ -D -o $(OWNER) -g $(GROUP) -m 444 $$f $(MAN8DIR)/$$f; \
+	   $(RM) $(DESTDIR)$(MAN8DIR)/$$f; \
+	   @INSTALL@ -D -o $(OWNER) -g $(GROUP) -m 444 $$f $(DESTDIR)$(MAN8DIR)/$$f; \
 	done
 

Re: [linux-lvm] DESTDIR is broken in 1.00.09

[Kevin P. Fleming]

Arkadiusz Miskiewicz wrote:

> bindir, libdir and friends are substituted to ${prefix}/bin only when --bindir 
> is not specified.

Hmmm, I submitted a patch to fix this problem before this last release, 
and it was accepted (with modifications) but didn't appear in the release.

Re: [linux-lvm] DESTDIR is broken in 1.00.09

[Alasdair G Kergon]

On Wed, Mar 31, 2004 at 09:48:26PM -0700, Kevin P. Fleming wrote:
> Hmmm, I submitted a patch to fix this problem before this last release, 
> and it was accepted (with modifications) but didn't appear in the release.

The problem is fixed in make.tmpl.in in the LVM2 release, but I haven't 
synced the updates to the build process across to the device-mapper tree yet.
I'll do it soon.

Alasdair
-- 
agk@redhat.com

Re: [linux-lvm] DESTDIR is broken in 1.00.09

[Alasdair G Kergon]

On Thu, Apr 01, 2004 at 10:44:09AM -0600, Alasdair G Kergon wrote:
> The problem is fixed in make.tmpl.in in the LVM2 release, but I haven't 
> synced the updates to the build process across to the device-mapper tree yet.
> I'll do it soon.

I've done this in CVS now; I'll create new tarballs.
 
Alasdair
-- 
agk@redhat.com