1
0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-23 14:42:29 +01:00

Invoke dh_link only once.

Instead of calling dh_link multiple times (once for each symlink) just
call it once, listing the requested links in debian/package.links.
This commit is contained in:
Andreas Metzler
2010-08-16 16:29:48 +02:00
committed by Carlos R. Mafra
parent 3751b587eb
commit 15f74cfb10
2 changed files with 3 additions and 6 deletions

7
debian/rules vendored
View File

@@ -179,6 +179,7 @@ binary-arch: build
$(RM) $(DEBTMPDIR)/$(MAN1DIR)/convertstyle* $(RM) $(DEBTMPDIR)/$(MAN1DIR)/convertstyle*
dh_installman -a dh_installman -a
dh_installchangelogs -a ChangeLog dh_installchangelogs -a ChangeLog
dh_link -a
# dh_strip -a # dh_strip -a
dh_lintian dh_lintian
dh_compress -a dh_compress -a
@@ -208,7 +209,6 @@ install-wmaker-stamp: build-wmaker-stamp
# First, provide a wrapper to compensate for Window Maker's funny first # First, provide a wrapper to compensate for Window Maker's funny first
# start up requierements # start up requierements
mv $(DEBTMPDIR)/$(BINDIR)/wmaker $(DEBTMPDIR)/$(PKGLIBDIR)/WindowMaker mv $(DEBTMPDIR)/$(BINDIR)/wmaker $(DEBTMPDIR)/$(PKGLIBDIR)/WindowMaker
dh_link $(PKGLIBDIR)/WindowMaker $(BINDIR)/WindowMaker
$(install_prog) debian/wmaker.sh $(DEBTMPDIR)/$(BINDIR)/wmaker $(install_prog) debian/wmaker.sh $(DEBTMPDIR)/$(BINDIR)/wmaker
-mv $(DEBTMPDIR)/$(BINDIR)/convertfonts $(DEBTMPDIR)/$(PKGLIBDIR)/ -mv $(DEBTMPDIR)/$(BINDIR)/convertfonts $(DEBTMPDIR)/$(PKGLIBDIR)/
@@ -261,11 +261,6 @@ install-wmaker-stamp: build-wmaker-stamp
# This has the new default Debian theme settings. # This has the new default Debian theme settings.
cp debian/WindowMaker.default $(DEBTMPDIR)/$(DEFAULTSDIR)/WindowMaker cp debian/WindowMaker.default $(DEBTMPDIR)/$(DEFAULTSDIR)/WindowMaker
# WPrefs
# fix the location of WPrefs
# mv $(DEBTMPDIR)/$(WPREFSAPPDIR)/WPrefs $(DEBTMPDIR)/$(BINDIR)
# dh_link $(BINDIR)/WPrefs $(WPREFSAPPDIR)/WPrefs
dh_link $(WPREFSAPPDIR)/WPrefs $(BINDIR)/WPrefs
# libwraster is compiled with tiff support, we don't need the xpm version # libwraster is compiled with tiff support, we don't need the xpm version
$(RM) -r $(DEBTMPDIR)/$(WPREFSAPPDIR)/xpm $(RM) -r $(DEBTMPDIR)/$(WPREFSAPPDIR)/xpm
$(RM) $(patsubst %.tiff,%.xpm,$(wildcard $(DEBTMPDIR)/$(WMSHAREDIR)/Icons/*.tiff)) $(RM) $(patsubst %.tiff,%.xpm,$(wildcard $(DEBTMPDIR)/$(WMSHAREDIR)/Icons/*.tiff))

2
debian/wmaker.links vendored Normal file
View File

@@ -0,0 +1,2 @@
usr/lib/WindowMaker/WindowMaker usr/bin/WindowMaker
usr/lib/GNUstep/System/Applications/WPrefs.app/WPrefs usr/bin/WPrefs