[Prism54-devel] [PATCH] Makefile Variables added: PREFIX and

[Martin Dummer]

This is a multi-part message in MIME format.

------=_NextPart_000_02BE_01C40940.4216BD80
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: 7bit

I needed the ability to have everything installed in a certain directory
when building an RPM package... here are my enhancements to the Makefile:


PREFIX  
    is added (prefixed) to all installation directories. 
    Default is empty, so default behaviour is unchanged

INSTALL_FIRMWARE  
    when set to "y" the firmware files will be installed in the 
    appropriate directories. Default is unset, so default is not 
    installing firmware files.


I hope this is useful for others, too
Martin




diff -Naur prism54-cvs20040313.org/Makefile prism54-cvs20040313/Makefile
--- prism54-cvs20040313.org/Makefile	Tue Mar  2 01:59:22 2004
+++ prism54-cvs20040313/Makefile	Sat Mar 13 11:10:11 2004
@@ -1,10 +1,12 @@
 # $Id: Makefile,v 1.9 2004/03/02 00:59:22 mcgrof Exp $
 
+PREFIX         := 
 KVER	       := $(shell uname -r)
-KDIR           := /lib/modules/$(KVER)/build
-KMISC          :=
/lib/modules/$(KVER)/kernel/drivers/net/wireless/prism54/
+KDIR           := $(PREFIX)/lib/modules/$(KVER)/build
+KMISC          :=
$(PREFIX)/lib/modules/$(KVER)/kernel/drivers/net/wireless/prism54/
 KEXT           := $(shell echo $(KVER) | sed -ne 's/^2\.[567]\..*/k/p')o
 KOUT           := $(KDIR)
+INSTALL_FIRMWARE := n
 
 .PHONY: default modules install clean module-all modules-clean
modules-install
 
@@ -13,11 +15,13 @@
 	@echo "*    please see README file for more information      *"
 	@echo "*******************************************************"
 	@echo ""
-	@echo " KVER = $(KVER)"
-	@echo " KDIR = $(KDIR)"
-	@echo " KMISC= $(KMISC)"
-	@echo " KEXT = $(KEXT)"
-	@echo " KOUT = $(KOUT)"
+	@echo " PREFIX = $(PREFIX)"
+	@echo " KVER   = $(KVER)"
+	@echo " KDIR   = $(KDIR)"
+	@echo " KMISC  = $(KMISC)"
+	@echo " KEXT   = $(KEXT)"
+	@echo " KOUT   = $(KOUT)"
+	@echo " INSTALL_FIRMWARE = $(INSTALL_FIRMWARE)"
 	@echo ""
 	@echo " supported make targets: modules install clean"
 	@echo ""
@@ -35,7 +39,10 @@
 modules-install:
 	install -d $(KMISC)
 	install -m 644 -c ksrc/prism54.$(KEXT) $(KMISC)
-	#install -d /usr/lib/hotplug/firmware
-	#install -c isl3877 /usr/lib/hotplug/firmware
-	#install -c isl3890 /usr/lib/hotplug/firmware
+ifeq "$(strip $(INSTALL_FIRMWARE))" "y"
+	install -d $(PREFIX)/usr/lib/hotplug/firmware
+	#install -c isl3877 $(PREFIX)/usr/lib/hotplug/firmware
+	install -c isl3890 $(PREFIX)/usr/lib/hotplug/firmware
+else
 	@echo "dont forget to copy firmware to /usr/lib/hotplug/firmware/
and have the hotplug tools in place"
+endif

------=_NextPart_000_02BE_01C40940.4216BD80
Content-Type: application/x-pkcs7-signature;
	name="smime.p7s"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
	filename="smime.p7s"

MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIJWDCCAuAw
ggJJoAMCAQICAwsjETANBgkqhkiG9w0BAQQFADBiMQswCQYDVQQGEwJaQTElMCMGA1UEChMcVGhh
d3RlIENvbnN1bHRpbmcgKFB0eSkgTHRkLjEsMCoGA1UEAxMjVGhhd3RlIFBlcnNvbmFsIEZyZWVt
YWlsIElzc3VpbmcgQ0EwHhcNMDMxMTEzMDY1MzM2WhcNMDQxMTEyMDY1MzM2WjBYMQ8wDQYDVQQE
EwZEdW1tZXIxDzANBgNVBCoTBk1hcnRpbjEWMBQGA1UEAxMNTWFydGluIER1bW1lcjEcMBoGCSqG
SIb3DQEJARYNbWQxMUBlcG9zdC5kZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANEC
wlRvRq63+5JgLR671FT0lEGkoSciwv9/Fhw0VUZD/DoPRunyxtMx+XMgfDR6IAYp1yuBsv9V354+
IGlV46v8IlA23itI7K7xArnjiAgBNArgw49kLxktD3hUaU3vX+FmMKjn8amRDDIES1iP5GYVlcbr
tL+pEPi7wqn/JsysyM1NyozKMq1mEfVW1+XhSMEFzjymnWeuHCQS6et834n2BjrcOp42egZkl0N4
1bvBjv8jtSNVweBfq23H02d2NNPpYjLbSLqqAalulrgB9RvNI022of8Fx7ZzgS+MnT7EzhghPmSS
g58f7R5jItEK/TKTp1sTb0AfaJ3r8y9ilQcCAwEAAaMqMCgwGAYDVR0RBBEwD4ENbWQxMUBlcG9z
dC5kZTAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBBAUAA4GBACWWMfnnh+4mn2aGPQoflYPXHCaQ
TQ0q4FWCYngOYMYkr8BLPZVdDi6ldBhwSSFQfX6t3Ya9oqiDW9/B6UCU+ei778SvD61DRMvt35fC
23RjamXRvF73i6DWpY8Yrlip4I9JHn3ViZ1ncYurx7PCaW48FpJg+iEzDQegrXHh7AT5MIIDLTCC
ApagAwIBAgIBADANBgkqhkiG9w0BAQQFADCB0TELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rl
cm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMRowGAYDVQQKExFUaGF3dGUgQ29uc3VsdGluZzEo
MCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEkMCIGA1UEAxMbVGhhd3Rl
IFBlcnNvbmFsIEZyZWVtYWlsIENBMSswKQYJKoZIhvcNAQkBFhxwZXJzb25hbC1mcmVlbWFpbEB0
aGF3dGUuY29tMB4XDTk2MDEwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgdExCzAJBgNVBAYTAlpB
MRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEaMBgGA1UEChMRVGhh
d3RlIENvbnN1bHRpbmcxKDAmBgNVBAsTH0NlcnRpZmljYXRpb24gU2VydmljZXMgRGl2aXNpb24x
JDAiBgNVBAMTG1RoYXd0ZSBQZXJzb25hbCBGcmVlbWFpbCBDQTErMCkGCSqGSIb3DQEJARYccGVy
c29uYWwtZnJlZW1haWxAdGhhd3RlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA1GnX
1LCUZFtx6UfYDFG26nKRsIRefS0Nj3sS34UldSh0OkIsYyeflXtL734Zhx2G6qPduc6WZBrCFG5E
rHzmj+hND3EfQDimAKOHePb5lIZererAXnbr2RSjXW56fAylS1V/Bhkpf56aJtVquzgkCGqYx7Ha
o5iR/Xnb5VrEHLkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQQFAAOBgQDH
7JJ+Tvj1lqVnYiqk8E0RYNBvjWBYYawmu1I1XAjPMPuoSpaKH2JCI4wXD/S6ZJwXrEcp352YXtJs
YHFcoqzceePnbgBHH7UNKOgCneSa/RP0ptl8sfjcXyMmCZGAc9AUG95DqYMl8uacLxXK/qarigd1
iwzdUYRr5PjRzneigTCCAz8wggKooAMCAQICAQ0wDQYJKoZIhvcNAQEFBQAwgdExCzAJBgNVBAYT
AlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEaMBgGA1UEChMR
VGhhd3RlIENvbnN1bHRpbmcxKDAmBgNVBAsTH0NlcnRpZmljYXRpb24gU2VydmljZXMgRGl2aXNp
b24xJDAiBgNVBAMTG1RoYXd0ZSBQZXJzb25hbCBGcmVlbWFpbCBDQTErMCkGCSqGSIb3DQEJARYc
cGVyc29uYWwtZnJlZW1haWxAdGhhd3RlLmNvbTAeFw0wMzA3MTcwMDAwMDBaFw0xMzA3MTYyMzU5
NTlaMGIxCzAJBgNVBAYTAlpBMSUwIwYDVQQKExxUaGF3dGUgQ29uc3VsdGluZyAoUHR5KSBMdGQu
MSwwKgYDVQQDEyNUaGF3dGUgUGVyc29uYWwgRnJlZW1haWwgSXNzdWluZyBDQTCBnzANBgkqhkiG
9w0BAQEFAAOBjQAwgYkCgYEAxKY8VXNV+065yplaHmjAdQRwnd/p/6Me7L3N9VvyGna9fww6YfK/
Uc4B1OVQCjDXAmNaLIkVcI7dyfArhVqqP3FWy688Cwfn8R+RNiQqE88r1fOCdz0Dviv+uxg+B79A
gAJk16emu59l0cUqVIUPSAR/p7bRPGEEQB5kGXJgt/sCAwEAAaOBlDCBkTASBgNVHRMBAf8ECDAG
AQH/AgEAMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmwudGhhd3RlLmNvbS9UaGF3dGVQZXJz
b25hbEZyZWVtYWlsQ0EuY3JsMAsGA1UdDwQEAwIBBjApBgNVHREEIjAgpB4wHDEaMBgGA1UEAxMR
UHJpdmF0ZUxhYmVsMi0xMzgwDQYJKoZIhvcNAQEFBQADgYEASIzRUIPqCy7MDaNmrGcPf6+svsIX
oUOWlJ1/TCG4+DYfqi2fNi/A9BxQIJNwPP2t4WFiw9k6GX6EsZkbAMUaC4J0niVQlGLH2ydxVyWN
3amcOY6MIE9lX5Xa9/eH1sYITq726jTlEBpbNU1341YheILcIRk13iSx0x1G/11fZU8xggNQMIID
TAIBATBpMGIxCzAJBgNVBAYTAlpBMSUwIwYDVQQKExxUaGF3dGUgQ29uc3VsdGluZyAoUHR5KSBM
dGQuMSwwKgYDVQQDEyNUaGF3dGUgUGVyc29uYWwgRnJlZW1haWwgSXNzdWluZyBDQQIDCyMRMAkG
BSsOAwIaBQCgggG8MBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTA0
MDMxMzIwMTUwNlowIwYJKoZIhvcNAQkEMRYEFCHAYx6tV02O/CcwKsmIaGZS9B7cMGcGCSqGSIb3
DQEJDzFaMFgwCgYIKoZIhvcNAwcwDgYIKoZIhvcNAwICAgCAMA0GCCqGSIb3DQMCAgFAMAcGBSsO
AwIHMA0GCCqGSIb3DQMCAgEoMAcGBSsOAwIaMAoGCCqGSIb3DQIFMHgGCSsGAQQBgjcQBDFrMGkw
YjELMAkGA1UEBhMCWkExJTAjBgNVBAoTHFRoYXd0ZSBDb25zdWx0aW5nIChQdHkpIEx0ZC4xLDAq
BgNVBAMTI1RoYXd0ZSBQZXJzb25hbCBGcmVlbWFpbCBJc3N1aW5nIENBAgMLIxEwegYLKoZIhvcN
AQkQAgsxa6BpMGIxCzAJBgNVBAYTAlpBMSUwIwYDVQQKExxUaGF3dGUgQ29uc3VsdGluZyAoUHR5
KSBMdGQuMSwwKgYDVQQDEyNUaGF3dGUgUGVyc29uYWwgRnJlZW1haWwgSXNzdWluZyBDQQIDCyMR
MA0GCSqGSIb3DQEBAQUABIIBAEOcwUZ65roQQccBUJOequkzLwbZcC2KA8oEivkujrrTYlZ9ckLM
cw02aAb5rToPOP4tJa1S/Om5JSwqVLD/zE3ZEppd9JBHxSbYr59YkCq9+9fR+6GYH3PcVLKjKk8N
ije1aCmKfrSYVhD3SxkWLlje/w5K3tS2Hhh8cDCqqCBazXylXsEqa/cwUTa7sd1RDx6vEmFETqa1
aCnZJqfpGZtEiK1uhrNua5biwM90hrXHunxWnu41Qnn/9TmKK5DCN32+r9DXLrVI5aGt3i3Pogs5
iOaWQwQoEubzicM6THjYG8/zz8PIKer4NVbd9fJJrohQ8YQYSbt51MMr4Q4o0xQAAAAAAAA=

------=_NextPart_000_02BE_01C40940.4216BD80--