FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Redhat > Device-mapper Development

 
 
LinkBack Thread Tools
 
Old 02-02-2010, 06:25 AM
 
Default Remove incorrect quoting from pattern in lib/Makefile.in

The
[[ string =~ pattern ]]
command in bash only treats unquoted characters in 'pattern'
as being pattern characters. If they are quoted, they much match
literally.

So we need to remove the quota for this match to work correctly.

This removes the need to explicitly install in dmraid.spec.


---
dmraid.spec | 8 --------
lib/Makefile.in | 2 +-
2 files changed, 1 insertion(+), 9 deletions(-)

--- dmraid.orig/dmraid.spec
+++ dmraid/dmraid.spec
@@ -87,14 +87,6 @@ ln -s dmraid $RPM_BUILD_ROOT/sbin/dmraid

install -m 644 include/dmraid/*.h $RPM_BUILD_ROOT%{_includedir}/dmraid/

-# If requested, install the libdmraid and libdmraid-events (for dmeventd) DSO
-install -m 755 lib/libdmraid.so
- $RPM_BUILD_ROOT%{_libdir}/libdmraid.so.%{version}
-(cd $RPM_BUILD_ROOT/%{_libdir} ; ln -sf libdmraid.so.%{version} libdmraid.so)
-install -m 755 lib/libdmraid-events-isw.so
- $RPM_BUILD_ROOT%{_libdir}/libdmraid-events-isw.so.%{version}
-(cd $RPM_BUILD_ROOT/%{_libdir} ; ln -sf libdmraid-events-isw.so.%{version} libdmraid-events-isw.so)
-
# Install logwatch config file and script for dmeventd
install -m 644 logwatch/dmeventd.conf $RPM_BUILD_ROOT/etc/logwatch/conf/services/dmeventd.conf
install -m 755 logwatch/dmeventd $RPM_BUILD_ROOT/etc/logwatch/scripts/services/dmeventd
--- dmraid.orig/lib/Makefile.in
+++ dmraid/lib/Makefile.in
@@ -82,7 +82,7 @@ install_dmraid_libs: $(INSTALL_TARGETS)
for f in $(INSTALL_TARGETS);
do
n=$$(basename $${f}) ;
- if [[ "$$n" =~ '.so$$' ]]; then
+ if [[ "$$n" =~ .so$$ ]]; then
$(INSTALL) -m 555 $(STRIP)
$$f $(libdir)/$${n}.@DMRAID_LIB_VERSION@;
$(LN_S) -f $${n}.@DMRAID_LIB_VERSION@ $(libdir)/$${n};

--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel
 

Thread Tools




All times are GMT. The time now is 09:31 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org