diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2013-07-26 18:20:00 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2013-07-26 18:20:00 +0000 |
| commit | dbded195f9840f9044a6828c8877c6bf0a956482 (patch) | |
| tree | e05da15a04629f6e36af5ca6c81a2efda47a9dc3 /generate/unix | |
| parent | 94c37fb2483cc09856a30e74879a69f2ccfe22f0 (diff) | |
| download | src-dbded195f9840f9044a6828c8877c6bf0a956482.tar.gz src-dbded195f9840f9044a6828c8877c6bf0a956482.zip | |
Import ACPICA 20130725.vendor/acpica/20130725
Notes
Notes:
svn path=/vendor-sys/acpica/dist/; revision=253681
svn path=/vendor-sys/acpica/20130725/; revision=253682; tag=vendor/acpica/20130725
Diffstat (limited to 'generate/unix')
| -rw-r--r-- | generate/unix/Makefile.common | 4 | ||||
| -rw-r--r-- | generate/unix/Makefile.config | 14 |
2 files changed, 13 insertions, 5 deletions
diff --git a/generate/unix/Makefile.common b/generate/unix/Makefile.common index 21f8786cbb91..fe5e46bd335a 100644 --- a/generate/unix/Makefile.common +++ b/generate/unix/Makefile.common @@ -6,7 +6,11 @@ # Get the OS machine architecture. Anything with a "64" in the returned # string will be treated as a 64-bit OS. Otherwise, the default is 32-bit. # +ifeq ($(HOST), _FreeBSD) +HARDWARE_NAME := $(shell uname -p) +else HARDWARE_NAME := $(shell uname -m) +endif # # Main rule will only generate versions that are appropriate for the running diff --git a/generate/unix/Makefile.config b/generate/unix/Makefile.config index 3e4ecd2b9de0..3c13f36a5f50 100644 --- a/generate/unix/Makefile.config +++ b/generate/unix/Makefile.config @@ -47,14 +47,18 @@ LINKPROG = $(CC) $(OBJECTS) -o $(PROG) $(LDFLAGS) PREFIX ?= /usr INSTALLDIR = $(PREFIX)/bin -ifneq ($(HOST), _APPLE) - INSTALLPROG = install -D ../$(BINDIR)/$(PROG) $(DESTDIR)$(INSTALLDIR)/$(PROG) +ifeq ($(HOST), _APPLE) +INSTALL = cp +INSTALLFLAGS ?= -f else - INSTALLPROG = \ - test -d $(DESTDIR)$(INSTALLDIR) || mkdir -p $(DESTDIR)$(INSTALLDIR); \ - cp -f ../$(BINDIR)/$(PROG) $(DESTDIR)$(INSTALLDIR)/$(PROG) +INSTALL = install +INSTALLFLAGS ?= -m 555 -s endif +INSTALLPROG = \ + mkdir -p $(DESTDIR)$(INSTALLDIR); \ + $(INSTALL) $(INSTALLFLAGS) ../$(BINDIR)/$(PROG) $(DESTDIR)$(INSTALLDIR)/$(PROG) + # # Rename a .exe file if necessary # |