129 lines
3.8 KiB
Diff
129 lines
3.8 KiB
Diff
From 9af4741c11d3ce138886dd8707b3e97e1e570edd Mon Sep 17 00:00:00 2001
|
|
From: Colin Walters <walters@verbum.org>
|
|
Date: Sun, 8 Jan 2012 17:17:40 -0500
|
|
Subject: [PATCH] Add a configure script to implement GNOME Build API
|
|
|
|
See http://people.gnome.org/~walters/docs/build-api.txt
|
|
|
|
This also required modifying the install rule to honor DESTDIR.
|
|
---
|
|
Makefile | 22 +++++---------------
|
|
configure | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
2 files changed, 69 insertions(+), 16 deletions(-)
|
|
create mode 100755 configure
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index efb0cc1..e360181 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -3,17 +3,7 @@ VERSION=$(shell awk '/Version:/ { print $$2 }' hwdata.spec)
|
|
RELEASE=$(shell rpm -q --specfile --qf "%{release}" hwdata.spec)
|
|
SOURCEDIR := $(shell pwd)
|
|
|
|
-prefix=$(DESTDIR)/usr
|
|
-sysconfdir=$(DESTDIR)/etc
|
|
-bindir=$(prefix)/bin
|
|
-sbindir=$(prefix)/sbin
|
|
-datadir=$(prefix)/share
|
|
-mandir=$(datadir)/man
|
|
-includedir=$(prefix)/include
|
|
-libdir=$(prefix)/lib
|
|
-
|
|
-CC=gcc
|
|
-CFLAGS=$(RPM_OPT_FLAGS) -g
|
|
+include Makefile.inc
|
|
|
|
CVSROOT = $(shell cat CVS/Root 2>/dev/null || :)
|
|
|
|
@@ -26,13 +16,13 @@ FILES = pci.ids upgradelist usb.ids oui.txt pnp.ids
|
|
all:
|
|
|
|
install:
|
|
- mkdir -p -m 755 $(datadir)/$(NAME)
|
|
+ mkdir -p -m 755 $(DESTDIR)$(datadir)/$(NAME)
|
|
for foo in $(FILES) ; do \
|
|
- install -m 644 $$foo $(datadir)/$(NAME) ;\
|
|
+ install -m 644 $(srcdir)/$$foo $(DESTDIR)$(datadir)/$(NAME) ;\
|
|
done
|
|
- mkdir -p -m 755 $(datadir)/$(NAME)/videoaliases
|
|
- mkdir -p -m 755 $(sysconfdir)/modprobe.d
|
|
- install -m 644 blacklist.conf $(sysconfdir)/modprobe.d
|
|
+ mkdir -p -m 755 $(DESTDIR)$(datadir)/$(NAME)/videoaliases
|
|
+ mkdir -p -m 755 $(DESTDIR)$(sysconfdir)/modprobe.d
|
|
+ install -m 644 $(srcdir)/blacklist.conf $(DESTDIR)$(sysconfdir)/modprobe.d
|
|
|
|
commit:
|
|
git commit -a ||:
|
|
diff --git a/configure b/configure
|
|
new file mode 100755
|
|
index 0000000..5f87c77
|
|
--- /dev/null
|
|
+++ b/configure
|
|
@@ -0,0 +1,63 @@
|
|
+#!/bin/bash
|
|
+# -*- mode: sh -*-
|
|
+# Minimal configure script which writes out a Makefile.inc
|
|
+# Copyright 2010, 2011 Colin Walters <walters@verbum.org>
|
|
+# Licensed under the new-BSD license (http://www.opensource.org/licenses/bsd-license.php)
|
|
+
|
|
+prefix=/usr
|
|
+
|
|
+# Little helper function for reading args from the commandline.
|
|
+# it automatically handles -a b and -a=b variants, and returns 1 if
|
|
+# we need to shift $3.
|
|
+read_arg() {
|
|
+ # $1 = arg name
|
|
+ # $2 = arg value
|
|
+ # $3 = arg parameter
|
|
+ local rematch='^[^=]*=(.*)$'
|
|
+ if [[ $2 =~ $rematch ]]; then
|
|
+ read "$1" <<< "${BASH_REMATCH[1]}"
|
|
+ else
|
|
+ read "$1" <<< "$3"
|
|
+ # There is no way to shift our callers args, so
|
|
+ # return 1 to indicate they should do it instead.
|
|
+ return 1
|
|
+ fi
|
|
+}
|
|
+
|
|
+while (($# > 0)); do
|
|
+ case "${1%%=*}" in
|
|
+ --prefix) read_arg prefix "$@" || shift;;
|
|
+ --bindir) read_arg bindir "$@" || shift;;
|
|
+ --sbindir) read_arg sbindir "$@" || shift;;
|
|
+ --libexecdir) read_arg libexecdir "$@" || shift;;
|
|
+ --datarootdir) read_arg datarootdir "$@" || shift;;
|
|
+ --datadir) read_arg datadir "$@" || shift;;
|
|
+ --sysconfdir) read_arg sysconfdir "$@" || shift;;
|
|
+ --libdir) read_arg libdir "$@" || shift;;
|
|
+ --mandir) read_arg mandir "$@" || shift;;
|
|
+ *) echo "Ignoring unknown option '$1'";;
|
|
+ esac
|
|
+ shift
|
|
+done
|
|
+
|
|
+# Handle srcdir != builddir
|
|
+srcdir=$(dirname $0)
|
|
+if ! test -f Makefile; then
|
|
+ ln -s ${srcdir}/Makefile Makefile
|
|
+fi
|
|
+
|
|
+cat > Makefile.inc.tmp <<EOF
|
|
+srcdir = ${srcdir}
|
|
+
|
|
+prefix ?= ${prefix}
|
|
+bindir ?= ${bindir:-${prefix}/bin}
|
|
+sbindir ?= ${sbindir:-${prefix}/sbin}
|
|
+libexecdir ?= ${libexecdir:-${prefix}/libexec}
|
|
+datarootdir ?= ${datarootdir:-${prefix}/share}
|
|
+datadir ?= ${datadir:-${datarootdir}}
|
|
+sysconfdir ?= ${sysconfdir:-${prefix}/etc}
|
|
+libdir ?= ${libdir:-${prefix}/lib}
|
|
+mandir ?= ${mandir:-${prefix}/share/man}
|
|
+
|
|
+EOF
|
|
+mv Makefile.inc.tmp Makefile.inc
|
|
--
|
|
1.7.6.4
|
|
|