svn commit: r437324 - head/sysutils/radeontop/files

Alexey Dokuchaev danfe at FreeBSD.org
Thu Mar 30 19:29:57 UTC 2017


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)


More information about the svn-ports-all mailing list