1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
|
diff -Nur nvclock0.8b4.orig/Makefile.in nvclock0.8b4/Makefile.in
--- nvclock0.8b4.orig/Makefile.in 2008-05-11 05:25:44.000000000 -0500
+++ nvclock0.8b4/Makefile.in 2009-01-07 16:15:50.088688188 -0600
@@ -1,8 +1,9 @@
INSTALL=@INSTALL@
+DESTDIR =
+prefix=@prefix@
+docdir=@docdir@
+mandir=@mandir@
-prefix=$(DESTDIR)@prefix@
-docdir=${prefix}/share/doc/nvclock
-mandir=${prefix}/man
DOCS= ABOUT AUTHORS ChangeLog FAQ README
all:
@@ -21,7 +22,7 @@
install-docs:
@documentations='$(DOCS)'; \
for doc in $$documentations; do \
- destdir=$(docdir); \
+ destdir=$(DESTDIR)$(docdir); \
name=`echo $$doc` \
dir=$$destdir; \
mkdir -p $$dir; \
@@ -30,14 +31,14 @@
done
install-desktop-shortcut:
- mkdir -p $(prefix)/share/applications
- mkdir -p $(prefix)/share/icons/hicolor/48x48/apps
- cp nvclock.desktop $(prefix)/share/applications
- cp nvclock.png $(prefix)/share/icons/hicolor/48x48/apps
+ mkdir -p $(DESTDIR)$(prefix)/share/applications
+ mkdir -p $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps
+ cp nvclock.desktop $(DESTDIR)$(prefix)/share/applications
+ cp nvclock.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps
install-man:
- mkdir -p $(mandir)/man1
- cp nvclock.1 $(mandir)/man1
+ mkdir -p $(DESTDIR)$(mandir)/man1
+ cp nvclock.1 $(DESTDIR)$(mandir)/man1
uninstall: uninstall-docs uninstall-man uninstall-desktop-shortcut
$(MAKE) -C src uninstall
@@ -45,7 +46,7 @@
uninstall-docs:
@documentations='$(DOCS)'; \
for doc in $$documentations; do \
- destdir=$(docdir); \
+ destdir=$(DESTDIR)$(docdir); \
name=`echo $$doc` \
dir=$$destdir; \
rm -f $$dir/$$name; \
@@ -53,11 +54,12 @@
done
uninstall-desktop-shortcut:
- rm -f $(prefix)/share/applications/nvclock.desktop
- echo "removing $$prefix/share/applications/nvclock.desktop" ; \
- rm -f $(prefix)/share/icons/hicolor/48x48/apps/nvclock.png
- echo "removing $$prefix/share/icons/hicolor/48x48/apps/nvclock.png" ; \
+ rm -f $(DESTDIR)$(prefix)/share/applications/nvclock.desktop
+ echo "removing $$(DESTDIR)$$prefix/share/applications/nvclock.desktop" ; \
+ rm -f $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/nvclock.png
+ echo "removing $$(DESTDIR)$$prefix/share/icons/hicolor/48x48/apps/nvclock.png" ; \
uninstall-man:
- rm -f $(mandir)/man1/nvclock.1
- echo "removing $$mandir/man1/nvclock.1" ; \
+ rm -f $$(DESTDIR)$(mandir)/man1/nvclock.1
+ echo "removing $$(DESTDIR)$$mandir/man1/nvclock.1" ; \
+
diff -Nur nvclock0.8b4.orig/src/Makefile.in nvclock0.8b4/src/Makefile.in
--- nvclock0.8b4.orig/src/Makefile.in 2009-01-03 11:02:54.000000000 -0600
+++ nvclock0.8b4/src/Makefile.in 2009-01-07 16:13:06.839689315 -0600
@@ -8,9 +8,9 @@
libbackend=./backend/libbackend.a
libnvcontrol=./nvcontrol/libnvcontrol.a
-prefix=$(DESTDIR)@prefix@
-exec_prefix=$(DESTDIR)@exec_prefix@
-bindir=$(DESTDIR)@bindir@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+bindir=@bindir@
ifeq ($(HAVE_NVCONTROL), yes)
DEPS=$(libbackend) $(libnvcontrol)
@@ -56,7 +56,7 @@
uninstall: uninstall-recursive uninstall-app
uninstall-app:
- rm -f $(bindir)/smartdimmer
+ rm -f $(DESTDIR)$(bindir)/smartdimmer
# Walk through the sub directories and do what is requested
diff -Nur nvclock0.8b4.orig/src/gtk/Makefile.in nvclock0.8b4/src/gtk/Makefile.in
--- nvclock0.8b4.orig/src/gtk/Makefile.in 2008-05-11 05:25:46.000000000 -0500
+++ nvclock0.8b4/src/gtk/Makefile.in 2009-01-07 16:13:54.808688249 -0600
@@ -7,14 +7,14 @@
libbackend=../backend/libbackend.a
libnvcontrol=../nvcontrol/libnvcontrol.a
-prefix=$(DESTDIR)@prefix@
-exec_prefix=$(DESTDIR)@exec_prefix@
-bindir=$(DESTDIR)@bindir@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+bindir=@bindir@
ifeq ($(HAVE_GTK2), yes)
PROGRAM=nvclock_gtk
- INSTALL_APP=mkdir -p $(bindir); $(INSTALL) -c $(PROGRAM) $(bindir)/$(PROGRAM)
- UNINSTALL_APP=rm -f $(bindir)/$(PROGRAM)
+ INSTALL_APP=mkdir -p $(DESTDIR)$(bindir); $(INSTALL) -c $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM)
+ UNINSTALL_APP=rm -f $(DESTDIR)$(bindir)/$(PROGRAM)
endif
ifeq ($(HAVE_NVCONTROL), yes)
diff -Nur nvclock0.8b4.orig/src/qt/Makefile.in nvclock0.8b4/src/qt/Makefile.in
--- nvclock0.8b4.orig/src/qt/Makefile.in 2008-05-11 05:25:46.000000000 -0500
+++ nvclock0.8b4/src/qt/Makefile.in 2009-01-07 16:15:03.885688805 -0600
@@ -8,14 +8,14 @@
HAVE_QT=@HAVE_QT@
libbackend=../backend/libbackend.a
-prefix=$(DESTDIR)@prefix@
-exec_prefix=$(DESTDIR)@exec_prefix@
-bindir=$(DESTDIR)@bindir@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+bindir=@bindir@
ifeq ($(HAVE_QT), yes)
PROGRAM=nvclock_qt
- INSTALL_APP=mkdir -p $(bindir); $(INSTALL) -c $(PROGRAM) $(bindir)/$(PROGRAM)
- UNINSTALL_APP=rm -f $(bindir)/$(PROGRAM)
+ INSTALL_APP=mkdir -p $(DESTDIR)$(bindir); $(INSTALL) -c $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM)
+ UNINSTALL_APP=rm -f $(DESTDIR)$(bindir)/$(PROGRAM)
endif
ifeq ($(HAVE_NVCONTROL), yes)
|
