Commit d5cd4e9c authored by Mattia Dongili's avatar Mattia Dongili

Always install in /lib

This removal seem to have been missed in 20070815-1.1 changelog and I
don't seem to be able to find an announcement email to the maintainers.
Signed-off-by: 's avatarMattia Dongili <malattia@linux.it>
parent 8ecc46a4
02_fix_install_directories.dpatch
#! /bin/sh /usr/share/dpatch/dpatch-run
## 02_fix_install_directories - Mattia Dongili <malattia@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Use Debian's multiarch directories
@DPATCH@
# Author: malattia
# Status: none
--- ./Makefile~clean 2006-04-12 22:27:54.083257719 +0200
+++ ./Makefile 2006-04-12 22:28:04.119884969 +0200
@@ -6,11 +6,7 @@ UMLVER = $(shell date +%Y%m%d)
TARBALL = uml_utilities_$(UMLVER).tar.bz2
BIN_DIR = /usr/bin
-ifeq ($(shell uname -m),x86_64)
-LIB_DIR = /usr/lib64/uml
-else
LIB_DIR = /usr/lib/uml
-endif
CFLAGS = -g -Wall
#CFLAGS = -g -O2 -Wall
--- ./uml_net/Makefile~clean 2006-04-13 20:36:20.910393394 +0200
+++ ./uml_net/Makefile 2006-04-13 20:36:42.763759144 +0200
@@ -4,8 +4,6 @@ BIN = uml_net
CFLAGS ?= -g -Wall
override CFLAGS += $(TUNTAP)
-BIN_DIR ?= /usr/bin
-
OBJS = ethertap.o host.o output.o slip.o uml_net.o
ifneq ($(TUNTAP),)
@@ -21,5 +19,5 @@ clean :
rm -f $(BIN) $(OBJS) *~
install : $(BIN)
- install -d $(DESTDIR)$(BIN_DIR)
- install -s -m 04755 $(BIN) $(DESTDIR)$(BIN_DIR)
+ install -d $(DESTDIR)$(LIB_DIR)
+ install -s -m 04755 $(BIN) $(DESTDIR)$(LIB_DIR)
--- ./tunctl/Makefile~clean 2006-04-13 20:48:45.300914894 +0200
+++ ./tunctl/Makefile 2006-04-13 20:49:08.218347144 +0200
@@ -2,7 +2,7 @@ OBJS = tunctl.o
BIN = tunctl
CFLAGS ?= -g -Wall
-BIN_DIR ?= /usr/bin
+SBIN_DIR ?= /usr/sbin
all : $(BIN)
@@ -13,5 +13,5 @@ clean :
rm -f $(BIN) $(OBJS) *~
install : $(BIN)
- install -d $(DESTDIR)$(BIN_DIR)
- install -s $(BIN) $(DESTDIR)$(BIN_DIR)
+ install -d $(DESTDIR)$(SBIN_DIR)
+ install -s $(BIN) $(DESTDIR)$(SBIN_DIR)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment