equal
deleted
inserted
replaced
28 # Except as contained in this notice, the name of a copyright holder |
28 # Except as contained in this notice, the name of a copyright holder |
29 # shall not be used in advertising or otherwise to promote the sale, use |
29 # shall not be used in advertising or otherwise to promote the sale, use |
30 # or other dealings in this Software without prior written authorization |
30 # or other dealings in this Software without prior written authorization |
31 # of the copyright holder. |
31 # of the copyright holder. |
32 # |
32 # |
33 # @(#)Makefile 1.69 06/10/24 |
33 # @(#)Makefile 1.70 06/11/20 |
34 # |
34 # |
35 |
35 |
36 PWD:sh=pwd |
36 PWD:sh=pwd |
37 TOP=$(PWD)/../.. |
37 TOP=$(PWD)/../.. |
38 BUILD_TYPES=32 |
38 BUILD_TYPES=32 |
67 bug-6450019.patch \ |
67 bug-6450019.patch \ |
68 Sun-colors.patch \ |
68 Sun-colors.patch \ |
69 barcode-hack.patch \ |
69 barcode-hack.patch \ |
70 glsnake.patch \ |
70 glsnake.patch \ |
71 allowRootByPassFlag.patch \ |
71 allowRootByPassFlag.patch \ |
72 bug-6478841.patch |
72 bug-6478841.patch \ |
|
73 bug-6461887.patch |
73 |
74 |
74 # Directory created by unpacking source |
75 # Directory created by unpacking source |
75 SOURCE_DIR=$(BUILD_DIR)/xscreensaver-$(XSCREENSAVER_VERS) |
76 SOURCE_DIR=$(BUILD_DIR)/xscreensaver-$(XSCREENSAVER_VERS) |
76 |
77 |
77 # Merge in additional sources from sun-src directory |
78 # Merge in additional sources from sun-src directory |