Hi Franky,
The following patch fixes the rpm build problems reported earlier
by Zdravko Nikolov (thanks for the report!).
--
Bob Copeland %% www.bobcopeland.com
# HG changeset patch
# User [EMAIL PROTECTED]
# Date 1166894911 18000
# Node ID 59f39fdb7791f2d0d6e50e10bc154e9a624daf3c
# Parent 8da81f13382d1a0c31405ee2c1f966daacfaeed7
Some build fixes including:
- Use a different makefile variable for install location so RPM building in a
separate root directory will work
- Specify the shell as bash so expansion will work under Ubuntu
- Use --parent flag to cp instead of shell for loop
diff -r 8da81f13382d -r 59f39fdb7791 Makefile
--- a/Makefile Sat Dec 02 21:11:20 2006 +0100
+++ b/Makefile Sat Dec 23 12:28:31 2006 -0500
@@ -2,9 +2,12 @@ TOOLSDIR=tools
TOOLSDIR=tools
PREFIX=/usr/local
VERSION=0.0.6
+DEST=$(PREFIX)
+SHELL=/bin/bash
export PREFIX
export VERSION
+export DEST
DISTNAME=libkarma-$(VERSION)
DISTFILES= $(LK_SRC)/{Jamfile,Makefile,*[ch]} \
@@ -39,9 +42,7 @@ dist:
mkdir -p $(DISTNAME)/$(LK_SRC)
mkdir -p $(DISTNAME)/$(TOOLSDIR)
mkdir -p $(DISTNAME)/karma-sharp
- for i in $(DISTFILES); do \
- cp $$i $(DISTNAME)/$$i ; \
- done
+ cp --parents $(DISTFILES) $(DISTNAME)
tar czvf $(DISTNAME).tar.gz $(DISTNAME)
$(RM) -r $(DISTNAME)
diff -r 8da81f13382d -r 59f39fdb7791 karma-sharp/Makefile
--- a/karma-sharp/Makefile Sat Dec 02 21:11:20 2006 +0100
+++ b/karma-sharp/Makefile Sat Dec 23 12:28:31 2006 -0500
@@ -26,18 +26,18 @@ karma-sharp.pc: FORCE
ifdef HAS_MONO
install: $(ASSEMBLY) karma-sharp.pc
- ../install-sh -d $(PREFIX)/lib/karma-sharp
- ../install-sh -d $(PREFIX)/lib/pkgconfig
- ../install-sh -t $(PREFIX)/lib/karma-sharp $(ASSEMBLY)
- ../install-sh -t $(PREFIX)/lib/pkgconfig -m 0644 karma-sharp.pc
+ ../install-sh -d $(DEST)/lib/karma-sharp
+ ../install-sh -d $(DEST)/lib/pkgconfig
+ ../install-sh -t $(DEST)/lib/karma-sharp $(ASSEMBLY)
+ ../install-sh -t $(DEST)/lib/pkgconfig -m 0644 karma-sharp.pc
else
install:
endif
uninstall: FORCE
- $(RM) -r $(PREFIX)/lib/karma-sharp
- $(RM) $(PREFIX)/lib/pkgconfig/karma-sharp.pc
+ $(RM) -r $(DEST)/lib/karma-sharp
+ $(RM) $(DEST)/lib/pkgconfig/karma-sharp.pc
$(ASSEMBLY): $(ASSEMBLY_SOURCES) $(ASSEMBLY_RESOURCES)
$(MCS) $(MCS_FLAGS) -unsafe -target:library -out:$@ $(ASSEMBLY_SOURCES)
$(ASSEMBLY_RESOURCES:%=-resource:%) -r:Mono.Posix
diff -r 8da81f13382d -r 59f39fdb7791 karma-tools.spec
--- a/karma-tools.spec Sat Dec 02 21:11:20 2006 +0100
+++ b/karma-tools.spec Sat Dec 23 12:28:31 2006 -0500
@@ -23,12 +23,12 @@ Rio Karma tools
%setup -n libkarma-%{version}
%build
-make PREFIX=$RPM_BUILD_ROOT/%_prefix
+make PREFIX=%_prefix DEST=$RPM_BUILD_ROOT/%_prefix
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT
-make install PREFIX=$RPM_BUILD_ROOT/%_prefix
+make install PREFIX=%_prefix DEST=$RPM_BUILD_ROOT/%_prefix
%clean
rm -rf $RPM_BUILD_ROOT
diff -r 8da81f13382d -r 59f39fdb7791 src/Makefile
--- a/src/Makefile Sat Dec 02 21:11:20 2006 +0100
+++ b/src/Makefile Sat Dec 23 12:28:31 2006 -0500
@@ -19,16 +19,16 @@ default: all
default: all
install:
- ../install-sh -m 0755 -d $(PREFIX)/lib
- ../install-sh -m 0755 -d $(PREFIX)/include
- ../install-sh -m 0755 -d $(PREFIX)/include/libkarma
- ../install-sh -m 0644 -t $(PREFIX)/lib/ $(LIBDIR)/$(TARGET).a
- ../install-sh -m 0755 -t $(PREFIX)/lib/ $(LIBDIR)/$(TARGET).so
- ../install-sh -m 0644 -t $(PREFIX)/include/libkarma/ $(INST_HEADERS)
+ ../install-sh -m 0755 -d $(DEST)/lib
+ ../install-sh -m 0755 -d $(DEST)/include
+ ../install-sh -m 0755 -d $(DEST)/include/libkarma
+ ../install-sh -m 0644 -t $(DEST)/lib/ $(LIBDIR)/$(TARGET).a
+ ../install-sh -m 0755 -t $(DEST)/lib/ $(LIBDIR)/$(TARGET).so
+ ../install-sh -m 0644 -t $(DEST)/include/libkarma/ $(INST_HEADERS)
uninstall:
- $(RM) $(PREFIX)/lib/$(TARGET).a $(PREFIX)/lib/$(TARGET).so*
- $(RM) -r $(PREFIX)/include/libkarma
+ $(RM) $(DEST)/lib/$(TARGET).a $(DEST)/lib/$(TARGET).so*
+ $(RM) -r $(DEST)/include/libkarma
OBJS = $(SRCS:.c=.o)
diff -r 8da81f13382d -r 59f39fdb7791 tools/Makefile
--- a/tools/Makefile Sat Dec 02 21:11:20 2006 +0100
+++ b/tools/Makefile Sat Dec 23 12:28:31 2006 -0500
@@ -27,11 +27,11 @@ karma_helper: karma_helper.c
$(CC) $(INCLUDES) $(CFLAGS) [EMAIL PROTECTED] -o $@ -lusb
install:
- ../install-sh -m 0755 -d $(PREFIX)/bin
- ../install-sh -m 0755 -t $(PREFIX)/bin/ $(TOOLS)
+ ../install-sh -m 0755 -d $(DEST)/bin
+ ../install-sh -m 0755 -t $(DEST)/bin/ $(TOOLS)
uninstall:
- cd $(PREFIX)/bin && $(RM) $(TOOLS)
+ cd $(DEST)/bin && $(RM) $(TOOLS)
.PHONY: clean
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
linux-karma-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-karma-devel
