From owner-svn-ports-all@freebsd.org Thu Mar 30 19:29:57 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 134A1D2686C; Thu, 30 Mar 2017 19:29:57 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BE7F47E5; Thu, 30 Mar 2017 19:29:56 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2UJTtOA029655; Thu, 30 Mar 2017 19:29:55 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2UJTtMf029653; Thu, 30 Mar 2017 19:29:55 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201703301929.v2UJTtMf029653@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Thu, 30 Mar 2017 19:29:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r437324 - head/sysutils/radeontop/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Mar 2017 19:29:57 -0000 Author: danfe Date: Thu Mar 30 19:29:55 2017 New Revision: 437324 URL: https://svnweb.freebsd.org/changeset/ports/437324 Log: Do not separate $(DESTDIR)$(PREFIX) with a slash: this is redundant when PREFIX is an absolute path (common case) and could break things if it is not (and DESTDIR is empty). Modified: head/sysutils/radeontop/files/patch-Makefile head/sysutils/radeontop/files/patch-translations_Makefile Modified: head/sysutils/radeontop/files/patch-Makefile ============================================================================== --- head/sysutils/radeontop/files/patch-Makefile Thu Mar 30 19:07:57 2017 (r437323) +++ head/sysutils/radeontop/files/patch-Makefile Thu Mar 30 19:29:55 2017 (r437324) @@ -39,13 +39,13 @@ -install: all - $(INSTALL) -D -m755 $(bin) $(DESTDIR)/$(PREFIX)/sbin/$(bin) +install: -+ $(INSTALL) -m755 $(bin) $(DESTDIR)/$(PREFIX)/sbin ++ $(INSTALL) -m755 $(bin) $(DESTDIR)$(PREFIX)/sbin ifeq ($(xcb), 1) - $(INSTALL) -D -m755 $(xcblib) $(DESTDIR)/$(PREFIX)/$(LIBDIR)/$(xcblib) -+ $(INSTALL) -m755 $(xcblib) $(DESTDIR)/$(PREFIX)/$(LIBDIR) ++ $(INSTALL) -m755 $(xcblib) $(DESTDIR)$(PREFIX)/$(LIBDIR) endif - $(INSTALL) -D -m644 radeontop.1 $(DESTDIR)/$(PREFIX)/share/man/man1/radeontop.1 -+ $(INSTALL) -m644 radeontop.1 $(DESTDIR)/$(MANPREFIX)/man/man1 ++ $(INSTALL) -m644 radeontop.1 $(DESTDIR)$(MANPREFIX)/man/man1 ifeq ($(nls), 1) $(MAKE) -C translations install PREFIX=$(PREFIX) endif Modified: head/sysutils/radeontop/files/patch-translations_Makefile ============================================================================== --- head/sysutils/radeontop/files/patch-translations_Makefile Thu Mar 30 19:07:57 2017 (r437323) +++ head/sysutils/radeontop/files/patch-translations_Makefile Thu Mar 30 19:29:55 2017 (r437324) @@ -5,6 +5,6 @@ %.inst: %.mo - $(INSTALL) -D -m 644 $< $(DESTDIR)/$(PREFIX)/share/locale/$*/LC_MESSAGES/radeontop.mo -+ $(INSTALL) -m 644 $< $(DESTDIR)/$(PREFIX)/share/locale/$*/LC_MESSAGES/radeontop.mo ++ $(INSTALL) -m 644 $< $(DESTDIR)$(PREFIX)/share/locale/$*/LC_MESSAGES/radeontop.mo install: all $(inst)